More renaming of fields to make code read clean