Renamed singletons on the C++ side
Renamed singletons on the Python side