Changed some old key names into new ones

Fixes: #852