diff --git a/packages/jsii/lib/validator.ts b/packages/jsii/lib/validator.ts
index 0d66bb12d9..55d1a68064 100644
--- a/packages/jsii/lib/validator.ts
+++ b/packages/jsii/lib/validator.ts
@@ -75,7 +75,7 @@ function _defaultValidations(): ValidationFunction[] {
             if (member.static && (member as spec.Property).const) { continue; }
             if (member.name && member.name !== Case.camel(member.name)) {
                 diagnostic(ts.DiagnosticCategory.Error,
-                            `Method and property names must use camelCase: ${member.name}`);
+                            `Method and non-static non-readonly property names must use camelCase: ${member.name}`);
             }
         }
     }
diff --git a/packages/jsii/test/negatives/neg.method-name.1.ts b/packages/jsii/test/negatives/neg.method-name.1.ts
index 879da41f56..904d6afed6 100644
--- a/packages/jsii/test/negatives/neg.method-name.1.ts
+++ b/packages/jsii/test/negatives/neg.method-name.1.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: METHOD
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: METHOD
 
 export class MyClass {
     public METHOD() {
diff --git a/packages/jsii/test/negatives/neg.method-name.2.ts b/packages/jsii/test/negatives/neg.method-name.2.ts
index c4baa80f75..1afff6517d 100644
--- a/packages/jsii/test/negatives/neg.method-name.2.ts
+++ b/packages/jsii/test/negatives/neg.method-name.2.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: hello_world
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: hello_world
 
 export class MyClass {
     public hello_world() {
diff --git a/packages/jsii/test/negatives/neg.property-name.1.ts b/packages/jsii/test/negatives/neg.property-name.1.ts
index 1d1e1c9b7c..97bb30e64a 100644
--- a/packages/jsii/test/negatives/neg.property-name.1.ts
+++ b/packages/jsii/test/negatives/neg.property-name.1.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: PROP
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: PROP
 
 export class MyClass {
     public PROP?: number;
diff --git a/packages/jsii/test/negatives/neg.property-name.2.ts b/packages/jsii/test/negatives/neg.property-name.2.ts
index 612a4828a4..43e07eeec0 100644
--- a/packages/jsii/test/negatives/neg.property-name.2.ts
+++ b/packages/jsii/test/negatives/neg.property-name.2.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: my_Prop
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: my_Prop
 
 export class MyClass {
     public my_Prop?: number;
diff --git a/packages/jsii/test/negatives/neg.static-method-name.1.ts b/packages/jsii/test/negatives/neg.static-method-name.1.ts
index ca3671dbf3..4e90570bac 100644
--- a/packages/jsii/test/negatives/neg.static-method-name.1.ts
+++ b/packages/jsii/test/negatives/neg.static-method-name.1.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: MethodIsNotCamelCase
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: MethodIsNotCamelCase
 
 export class MyClass {
     MethodIsNotCamelCase() {
diff --git a/packages/jsii/test/negatives/neg.static-method-name.ts b/packages/jsii/test/negatives/neg.static-method-name.ts
index 5d3fcb0422..2d07c4eeee 100644
--- a/packages/jsii/test/negatives/neg.static-method-name.ts
+++ b/packages/jsii/test/negatives/neg.static-method-name.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: METHOD
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: METHOD
 
 export class MyClass {
     METHOD() {
diff --git a/packages/jsii/test/negatives/neg.static-prop-name.1.ts b/packages/jsii/test/negatives/neg.static-prop-name.1.ts
index dd5e8b0ec8..a576492047 100644
--- a/packages/jsii/test/negatives/neg.static-prop-name.1.ts
+++ b/packages/jsii/test/negatives/neg.static-prop-name.1.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: Prop
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: Prop
 
 export class MyClass {
     static get Prop() {
diff --git a/packages/jsii/test/negatives/neg.static-prop-name.2.ts b/packages/jsii/test/negatives/neg.static-prop-name.2.ts
index 4551e14a1f..b22b20a14a 100644
--- a/packages/jsii/test/negatives/neg.static-prop-name.2.ts
+++ b/packages/jsii/test/negatives/neg.static-prop-name.2.ts
@@ -1,4 +1,4 @@
-///!MATCH_ERROR: Method and property names must use camelCase: PROP
+///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: PROP
 
 export class MyClass {
     static get PROP() {