Remove omx infix from app module names