MAJ-1094: restructured back to shorter names