Updated namespaces for the following files