Addition of Namespace variable to replace name when creating code, etc