fixes stupid naming of fields