Continue namespace refactoring. This commit cleans up the page load errors resulting from massive renaming. Fixing runtime errors next.