Fixing issue with Object Property Name creation