various name adjustments in scene data to improve consistency