Modified name of all "type" fields