Changed names of files and namespaces to match proper page type names