Renamed key classes to avoid name collisions by adding oii prefix