Updated namespace for the final version

Again, but believe that it is now good and set for approval