fixed name changes