Another rename
And yet another rename, coz submodules are stupid
Fixed typo in submodule, works now