Bugfix: corrected invalid JSON property names after refactoring