Changes related to variable/method names to work with Jsons IO