Apply new naming scheme
Apply new naming scheme