diff --git a/google/resource_cloudfunctions_function.go b/google/resource_cloudfunctions_function.go
index 6978cab0299..bcf86d29fb3 100644
--- a/google/resource_cloudfunctions_function.go
+++ b/google/resource_cloudfunctions_function.go
@@ -267,7 +267,7 @@ func resourceCloudFunctionsCreate(d *schema.ResourceData, meta interface{}) erro
 		// Make PubSub event publish as in https://cloud.google.com/functions/docs/calling/pubsub
 		function.EventTrigger = &cloudfunctions.EventTrigger{
 			// Other events are not supported
-			EventType: "providers/cloud.pubsub/eventTypes/topic.publish",
+			EventType: "google.pubsub.topic.publish",
 			// Must be like projects/PROJECT_ID/topics/NAME
 			// Topic must be in same project as function
 			Resource: fmt.Sprintf("projects/%s/topics/%s", project, v.(string)),
@@ -350,7 +350,7 @@ func resourceCloudFunctionsRead(d *schema.ResourceData, meta interface{}) error
 	if function.EventTrigger != nil {
 		switch function.EventTrigger.EventType {
 		// From https://github.com/google/google-api-go-client/blob/master/cloudfunctions/v1/cloudfunctions-gen.go#L335
-		case "providers/cloud.pubsub/eventTypes/topic.publish":
+		case "google.pubsub.topic.publish":
 			d.Set("trigger_topic", GetResourceNameFromSelfLink(function.EventTrigger.Resource))
 		case "providers/cloud.storage/eventTypes/object.change":
 			d.Set("trigger_bucket", GetResourceNameFromSelfLink(function.EventTrigger.Resource))
diff --git a/google/resource_cloudfunctions_function_test.go b/google/resource_cloudfunctions_function_test.go
index dec5f4658bf..c432c2696c6 100644
--- a/google/resource_cloudfunctions_function_test.go
+++ b/google/resource_cloudfunctions_function_test.go
@@ -296,8 +296,8 @@ func testAccCloudFunctionsFunctionTrigger(n int, function *cloudfunctions.CloudF
 			if function.EventTrigger == nil {
 				return fmt.Errorf("Expected EventTrigger to be set")
 			}
-			if strings.Index(function.EventTrigger.EventType, "cloud.pubsub") == -1 {
-				return fmt.Errorf("Expected cloud.pubsub EventType, found %s", function.EventTrigger.EventType)
+			if strings.Index(function.EventTrigger.EventType, "google.pubsub") == -1 {
+				return fmt.Errorf("Expected google.pubsub EventType, found %s", function.EventTrigger.EventType)
 			}
 		default:
 			return fmt.Errorf("testAccCloudFunctionsFunctionTrigger expects only FUNCTION_TRIGGER_HTTP, " +