Some minor name rafactoring