Module renames

Various renames, so that coverage will give realistic measures