fixed name references