Fixed submodule mappings.