variable renames, method renames, fix unused imports