[IO-500] Naming conventions