This is a convention we've already adopted but we haven't had the chance to do a clean sweep of the rest of the codebase unfortunately. You're right though, it's one of our biggest hurdles to upgrading.