Get rid of FieldNamesMap and FieldNamesEntry and instead add some extra info to annotations.

Also change name of a property as it implied the wrong sense for a boolean.