Tones (I, II, ...) now nested in object Tone for renaming facility