More work refactoring to make Hooman names for stuff