Updated naming facilities