Fixed mistakes with missed namespaces, and invalid file names.