#568 rename refactoring, fixed tests.