rename a few bits and bobs
minor refactoring
minor refactoring