Rename submodules for less redundancy