refactoring some namings