renamed everything for the move to namespace autoloading