diff --git a/checks/naming.go b/checks/naming.go
index 477f598..a8c8106 100644
--- a/checks/naming.go
+++ b/checks/naming.go
@@ -8,23 +8,35 @@ import (
 	"github.com/UrbanCompass/thriftlint"
 )
 
-var (
-	upperCamelCaseRegex = `^[_A-Z][a-z]*([A-Z][0-9a-z]*)*$`
-	lowerCamelCaseRegex = `^[_a-z]+([A-Z0-9a-z]*)*$`
-	upperSnakeCaseRegex = `^[A-Z_]+([A-Z0-9]+_?)*$`
-)
+type NamingStyle struct {
+	Name    string
+	Pattern *regexp.Regexp
+}
 
 var (
+	upperCamelCaseStyle = NamingStyle{
+		Name:    "title case",
+		Pattern: regexp.MustCompile(`^_?([A-Z][0-9a-z]*)*$`),
+	}
+	lowerCamelCaseStyle = NamingStyle{
+		Name:    "camel case",
+		Pattern: regexp.MustCompile(`^_?[a-z][A-Z0-9a-z]*$`),
+	}
+	upperSnakeCaseStyle = NamingStyle{
+		Name:    "upper snake case",
+		Pattern: regexp.MustCompile(`^_?[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$`),
+	}
+
 	// CheckNamesDefaults is a map of Thrift AST node type to a regular expression for
 	// validating names of that type.
-	CheckNamesDefaults = map[reflect.Type]string{
-		thriftlint.ServiceType:   upperCamelCaseRegex,
-		thriftlint.EnumType:      upperCamelCaseRegex,
-		thriftlint.StructType:    upperCamelCaseRegex,
-		thriftlint.EnumValueType: upperSnakeCaseRegex,
-		thriftlint.FieldType:     lowerCamelCaseRegex,
-		thriftlint.MethodType:    lowerCamelCaseRegex,
-		thriftlint.ConstantType:  upperSnakeCaseRegex,
+	CheckNamesDefaults = map[reflect.Type]NamingStyle{
+		thriftlint.ServiceType:   upperCamelCaseStyle,
+		thriftlint.EnumType:      upperCamelCaseStyle,
+		thriftlint.StructType:    upperCamelCaseStyle,
+		thriftlint.EnumValueType: upperSnakeCaseStyle,
+		thriftlint.FieldType:     lowerCamelCaseStyle,
+		thriftlint.MethodType:    lowerCamelCaseStyle,
+		thriftlint.ConstantType:  upperSnakeCaseStyle,
 	}
 
 	// CheckNamesDefaultBlacklist is names that should never be used for symbols.
@@ -36,18 +48,14 @@ var (
 
 // CheckNames checks Thrift symbols comply with a set of regular expressions.
 //
-// If mathces or blacklist are nil, global defaults will be used.
-func CheckNames(matches map[reflect.Type]string, blacklist map[string]bool) thriftlint.Check {
+// If matches or blacklist are nil, global defaults will be used.
+func CheckNames(matches map[reflect.Type]NamingStyle, blacklist map[string]bool) thriftlint.Check {
 	if matches == nil {
 		matches = CheckNamesDefaults
 	}
 	if blacklist == nil {
 		blacklist = CheckNamesDefaultBlacklist
 	}
-	regexes := map[reflect.Type]*regexp.Regexp{}
-	for t, p := range matches {
-		regexes[t] = regexp.MustCompile(p)
-	}
 	return thriftlint.MakeCheck("naming", func(v interface{}) (messages thriftlint.Messages) {
 		rv := reflect.Indirect(reflect.ValueOf(v))
 		nameField := rv.FieldByName("Name")
@@ -56,16 +64,16 @@ func CheckNames(matches map[reflect.Type]string, blacklist map[string]bool) thri
 		}
 		name := nameField.Interface().(string)
 		// Special-case DEPRECATED_ fields.
-		checker, ok := regexes[rv.Type()]
+		checker, ok := matches[rv.Type()]
 		if !ok || strings.HasPrefix(name, "DEPRECATED_") {
 			return nil
 		}
 		if blacklist[name] {
 			messages.Warning(v, "%q is a disallowed name", name)
 		}
-		if ok := checker.MatchString(name); !ok {
-			messages.Warning(v, "name of %s %q should match %q", strings.ToLower(rv.Type().Name()),
-				name, checker.String())
+		if ok := checker.Pattern.MatchString(name); !ok {
+			messages.Warning(v, "name of %s %q should be %s", strings.ToLower(rv.Type().Name()),
+				name, checker.Name)
 		}
 		return
 	})