refactorings and renames for more consistency