diff --git a/dist/definitions.json b/dist/definitions.json
index ad8a6b3af..6b1d0b06d 100644
--- a/dist/definitions.json
+++ b/dist/definitions.json
@@ -1679,7 +1679,8 @@
       "first": {
         "type": "string",
         "minLength": 1,
-        "maxLength": 25
+        "maxLength": 25,
+        "pattern": "^.*\\S.*"
       },
       "middle": {
         "type": "string",
@@ -1687,8 +1688,9 @@
       },
       "last": {
         "type": "string",
-        "minLength": 1,
-        "maxLength": 35
+        "minLength": 2,
+        "maxLength": 35,
+        "pattern": "^.*\\S.*"
       },
       "suffix": {
         "type": "string",
diff --git a/src/common/definitions.js b/src/common/definitions.js
index 165003564..9aca35345 100644
--- a/src/common/definitions.js
+++ b/src/common/definitions.js
@@ -31,6 +31,7 @@ let hcaFullName = _.cloneDeep(fullName);
 hcaFullName.properties.first.maxLength = 25;
 hcaFullName.properties.last.maxLength = 35;
 hcaFullName.properties.middle.maxLength = 30;
+hcaFullName.properties.last.minLength = 2;
 
 const fullNameNoSuffix = {
   type: 'object',