Renaming and test refactoring