Fixing registration namespace isssues