Some other name changing related things

Signed-off-by: emanuele <emanuele45@gmail.com>
Merge pull request #75 from emanuele45/dia_to_elk

Some other name changing related things