Recommend doing i18N while cleaning up things like this. Given the scope of all the changes going on, I won't require it, but it's good to keep in mind.