diff --git a/google/resource_spanner_database.go b/google/resource_spanner_database.go
index 2bc481e9..d5238dfc 100644
--- a/google/resource_spanner_database.go
+++ b/google/resource_spanner_database.go
@@ -49,7 +49,7 @@ func resourceSpannerDatabase() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validateRegexp(`^(?:[a-z](?:[-_a-z0-9]{0,28}[a-z0-9])?)$`),
+				ValidateFunc: validateRegexp(`^[a-z][a-z0-9_\-]*[a-z0-9]$`),
 			},
 			"ddl": {
 				Type:     schema.TypeList,
diff --git a/google/resource_spanner_instance.go b/google/resource_spanner_instance.go
index 6b66dc57..4873d8e4 100644
--- a/google/resource_spanner_instance.go
+++ b/google/resource_spanner_instance.go
@@ -52,16 +52,15 @@ func resourceSpannerInstance() *schema.Resource {
 				DiffSuppressFunc: compareSelfLinkOrResourceName,
 			},
 			"display_name": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validateRegexp(`^(?:[a-zA-Z](?:[- _a-zA-Z0-9]{2,28}[a-zA-Z0-9])?)$`),
+				Type:     schema.TypeString,
+				Required: true,
 			},
 			"name": {
 				Type:         schema.TypeString,
 				Computed:     true,
 				Optional:     true,
 				ForceNew:     true,
-				ValidateFunc: validateRegexp(`^(?:[a-z](?:[-_a-z0-9]{4,28}[a-z0-9])?)$`),
+				ValidateFunc: validateRegexp(`^[a-z][-a-z0-9]*[a-z0-9]$`),
 			},
 			"labels": {
 				Type:     schema.TypeMap,