MAJ-1094: renamed modules