The relation field name (e.g Thingy__r) is now generated in an
association method. Fixed it was adding __r to standard types and it
shouldn't.