Rename all the things for the lolz / sergio asked for it in the PR