Closes GlobalNamesArchitecture/GNITE#3