Names/paths updates

Dia->Elk.