Fixing a few things. Namespace configuration.