diff --git a/build/generate/featureMatrix.go b/build/generate/featureMatrix.go
index ff5ff3705..bb2345ab6 100644
--- a/build/generate/featureMatrix.go
+++ b/build/generate/featureMatrix.go
@@ -74,13 +74,13 @@ func generateFeatureMatrix() error {
 		fm.SetSimple("Registrar", false, func() bool { return providers.RegistrarTypes[p] != nil })
 		setCap("ALIAS", providers.CanUseAlias)
 		setCap("CAA", providers.CanUseCAA)
-		setCap("PTR", providers.CanUsePTR)
 		setCap("NAPTR", providers.CanUseNAPTR)
+		setCap("PTR", providers.CanUsePTR)
+		setCap("R53_ALIAS", providers.CanUseRoute53Alias)
 		setCap("SRV", providers.CanUseSRV)
 		setCap("SSHFP", providers.CanUseSSHFP)
 		setCap("TLSA", providers.CanUseTLSA)
 		setCap("TXTMulti", providers.CanUseTXTMulti)
-		setCap("R53_ALIAS", providers.CanUseRoute53Alias)
 		setDoc("dual host", providers.DocDualHost, false)
 		setDoc("create-domains", providers.DocCreateDomains, true)
 
diff --git a/models/record.go b/models/record.go
index cff9ab26a..4b6e4693d 100644
--- a/models/record.go
+++ b/models/record.go
@@ -19,9 +19,9 @@ import (
 //     CAA
 //     CNAME
 //     MX
+//     NAPTR
 //     NS
 //     PTR
-//     NAPTR
 //     SRV
 //     SSHFP
 //     TLSA
diff --git a/models/t_parse.go b/models/t_parse.go
index 0f3f5d9db..886300e13 100644
--- a/models/t_parse.go
+++ b/models/t_parse.go
@@ -38,10 +38,10 @@ func (r *RecordConfig) PopulateFromString(rtype, contents, origin string) error
 		return r.SetTarget(contents)
 	case "CAA":
 		return r.SetTargetCAAString(contents)
-	case "NAPTR":
-		return r.SetTargetNAPTRString(contents)
 	case "MX":
 		return r.SetTargetMXString(contents)
+	case "NAPTR":
+		return r.SetTargetNAPTRString(contents)
 	case "SRV":
 		return r.SetTargetSRVString(contents)
 	case "SSHFP":