more refactoring
renames