Updated naming in atmosphere and related files