Rename variable once again.
Add missing import.