Fixing issue with collision on reserved property name