More changes to complete submodule rename...