Namespace changes and fixes