[destevil]

These will diverge. It isn't worth it to refactor since you'll just introduce new bugs. Keep a glossary or a naming spreadsheet if there are too many to remember.