- Fix naming conflicts with official names.