Saner names for struct fields