Update json keys to abide naming conventions