Updated all files to serve the new namespace conditions