fixed name screwups