Rename variables
Fix object key parsing