Refactoring and name changes