Namespace gauge keys correctly