Consistent ATLAS label handling

Edited by Frank Sauerburger