renaming stuff

refactoring in places