corrected some names and imports