Rename the methods and fix the import statements.