Fix creation for fields with roleTerms in their name.