Fixing the names of the sub-modules