diff --git a/protocol/network_rating.go b/protocol/network_rating.go
index d1aa2a5..2025349 100644
--- a/protocol/network_rating.go
+++ b/protocol/network_rating.go
@@ -20,37 +20,37 @@ const (
 )
 
 var networkRatingToLongString = map[NetworkRating]string{
-	-1: "Inactive",
-	0:  "Suspended",
-	1:  "Observer",
-	2:  "Tower Trainee",
-	3:  "Tower Controller",
-	4:  "Senior Student",
-	5:  "Enroute Controller",
-	6:  "Controller 2",
-	7:  "Senior Controller",
-	8:  "Instructor",
-	9:  "Instructor 2",
-	10: "Senior Instructor",
-	11: "Supervisor",
-	12: "Administrator",
+	NetworkRatingINAC: "Inactive",
+	NetworkRatingSUS:  "Suspended",
+	NetworkRatingOBS:  "Observer",
+	NetworkRatingS1:   "Tower Trainee",
+	NetworkRatingS2:   "Tower Controller",
+	NetworkRatingS3:   "Senior Student",
+	NetworkRatingC1:   "Enroute Controller",
+	NetworkRatingC2:   "Controller 2",
+	NetworkRatingC3:   "Senior Controller",
+	NetworkRatingI1:   "Instructor",
+	NetworkRatingI2:   "Instructor 2",
+	NetworkRatingI3:   "Senior Instructor",
+	NetworkRatingSUP:  "Supervisor",
+	NetworkRatingADM:  "Administrator",
 }
 
 var networkRatingToShortString = map[NetworkRating]string{
-	-1: "INAC",
-	0:  "SUS",
-	1:  "OBS",
-	2:  "S1",
-	3:  "S2",
-	4:  "S3",
-	5:  "C1",
-	6:  "C2",
-	7:  "C3",
-	8:  "I1",
-	9:  "I2",
-	10: "I3",
-	11: "SUP",
-	12: "ADM",
+	NetworkRatingINAC: "INAC",
+	NetworkRatingSUS:  "SUS",
+	NetworkRatingOBS:  "OBS",
+	NetworkRatingS1:   "S1",
+	NetworkRatingS2:   "S2",
+	NetworkRatingS3:   "S3",
+	NetworkRatingC1:   "C1",
+	NetworkRatingC2:   "C2",
+	NetworkRatingC3:   "C3",
+	NetworkRatingI1:   "I1",
+	NetworkRatingI2:   "I2",
+	NetworkRatingI3:   "I3",
+	NetworkRatingSUP:  "SUP",
+	NetworkRatingADM:  "ADM",
 }
 
 func (n NetworkRating) String() string {
diff --git a/protocol/pilot_rating.go b/protocol/pilot_rating.go
index 12f0c2e..1cdb491 100644
--- a/protocol/pilot_rating.go
+++ b/protocol/pilot_rating.go
@@ -13,23 +13,23 @@ const (
 )
 
 var pilotRatingToLongString = map[PilotRating]string{
-	0:  "Basic Member",
-	1:  "Private Pilot License",
-	3:  "Instrument Rating",
-	7:  "Commercial Multi-Engine License",
-	15: "Airline Transport Pilot License",
-	31: "Flight Instructor",
-	63: "Flight Examiner",
+	PilotRatingNEW:  "Basic Member",
+	PilotRatingPPL:  "Private Pilot License",
+	PilotRatingIR:   "Instrument Rating",
+	PilotRatingCMEL: "Commercial Multi-Engine License",
+	PilotRatingATPL: "Airline Transport Pilot License",
+	PilotRatingFI:   "Flight Instructor",
+	PilotRatingFE:   "Flight Examiner",
 }
 
 var pilotRatingToShortString = map[PilotRating]string{
-	0:  "NEW",
-	1:  "PPL",
-	3:  "IR",
-	7:  "CMEL",
-	15: "ATPL",
-	31: "FI",
-	63: "FE",
+	PilotRatingNEW:  "NEW",
+	PilotRatingPPL:  "PPL",
+	PilotRatingIR:   "IR",
+	PilotRatingCMEL: "CMEL",
+	PilotRatingATPL: "ATPL",
+	PilotRatingFI:   "FI",
+	PilotRatingFE:   "FE",
 }
 
 func ForEachPilotRating(f func(id PilotRating, shortString, longString string)) {