20141129 - Fix for namespace collisions - see notes