Amend Yaml files.

Moved to English keys whenever possible.
Removed unused keys.