update some name mismatches and fixed some imports