Updates to the API code, part of which was to fix the default namespace as it collided with the standard namespace in the project and caused issues