Updated Namespace to work with index.html, removed old identifiers