renamed badly named fields in test models