Revert "Changes the names of the submodules"

This reverts commit df0eb4fa628cab33cb7078926379271b203667b5.
Removes incorrectly named submodules