Changing some struct names for clarity