CXX-237 rename, before using classes
CXX-237 major clean up