Did some more renaming (namely things I missed before)