some name refactorings