I thought about splitting this into smaller commits but fuck it
There was little point to doing this anyway as project-wide find & replace is trivial.