refactoring naming
the long refactoring haul
namespace refactorign
cleanup