Renamed some key names

* Fix: avoid "-" characters for better JavaScript access