Naming more consistently with LightORama