Changed names & JSON serialization