Namespace and filenames updates