Fix keys
Fix property name