Changed custom field names to make it compatiable with other Plugins