More and more namespace updates and clean up.