CXX-175 rename files and things