Fix argument names and imports.