Additional refactoring of names