Then rename that as well, doesn't have to happen in this PR though (as that are many changes it highly increases the chances of merge conflicts)