Bug 1061448 - Correct the match of property names and field names