And by “fix this” I mean “rename stuff in our codebase”