Updated packet and field names to reflect use