Namespace movement to fix a few inconsistencies