diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td
index afd413fcab5e..19b0ea3932a5 100644
--- a/clang/include/clang/Basic/DiagnosticParseKinds.td
+++ b/clang/include/clang/Basic/DiagnosticParseKinds.td
@@ -202,8 +202,8 @@ def warn_expected_implementation : Warning<
 def error_property_ivar_decl : Error<
   "property synthesize requires specification of an ivar">;
 def warn_semicolon_before_method_nody : Warning<
-  "semicolon at start of method definition is ignored">,
-  InGroup<DiagGroup<"semicolon-at-method-body">>;
+  "semicolon before method body is ignored">,
+  InGroup<DiagGroup<"semicolon-before-method-body">>;
 
 def err_expected_field_designator : Error<
   "expected a field designator, such as '.field = 4'">;
diff --git a/clang/test/SemaObjC/objc-string-constant.m b/clang/test/SemaObjC/objc-string-constant.m
index a4d83854c197..d27a46a96632 100644
--- a/clang/test/SemaObjC/objc-string-constant.m
+++ b/clang/test/SemaObjC/objc-string-constant.m
@@ -29,7 +29,7 @@
 @end
 
 @implementation Subclass
-- (NSString *)token;	// expected-warning {{semicolon at start of method definition is ignored}}
+- (NSString *)token;	// expected-warning {{semicolon before method body is ignored}}
 {
   NSMutableString *result = nil;