diff --git a/gapic/lang/csharp_gapic.yaml b/gapic/lang/csharp_gapic.yaml
index c5237c1e9..81b33fa7a 100644
--- a/gapic/lang/csharp_gapic.yaml
+++ b/gapic/lang/csharp_gapic.yaml
@@ -1,7 +1,7 @@
-type: io.gapi.vgen.ConfigProto
+type: com.google.api.codegen.ConfigProto
 language: csharp
 templates:
-- language_provider: io.gapi.vgen.csharp.CSharpGapicLanguageProvider
-  input_element_view: io.gapi.vgen.csharp.CSharpInterfaceView
+- codegen_provider: com.google.api.codegen.csharp.CSharpGapicProvider
+  input_element_view: com.google.api.codegen.csharp.CSharpInterfaceView
   snippet_files:
   - wrapper.snip
diff --git a/gapic/lang/go_gapic.yaml b/gapic/lang/go_gapic.yaml
index 7b10c6bfc..e944e9f87 100644
--- a/gapic/lang/go_gapic.yaml
+++ b/gapic/lang/go_gapic.yaml
@@ -1,8 +1,8 @@
-type: io.gapi.vgen.ConfigProto
+type: com.google.api.codegen.ConfigProto
 language: go
 templates:
-- language_provider: io.gapi.vgen.go.GoGapicLanguageProvider
-  input_element_view: io.gapi.vgen.InterfaceView
+- codegen_provider: com.google.api.codegen.go.GoGapicProvider
+  input_element_view: com.google.api.codegen.InterfaceView
   snippet_files:
   - main.snip
   - doc.snip
diff --git a/gapic/lang/java_gapic.yaml b/gapic/lang/java_gapic.yaml
index 3ae3d7a26..966afaf68 100644
--- a/gapic/lang/java_gapic.yaml
+++ b/gapic/lang/java_gapic.yaml
@@ -1,8 +1,8 @@
-type: io.gapi.vgen.ConfigProto
+type: com.google.api.codegen.ConfigProto
 language: java
 templates:
-- language_provider: io.gapi.vgen.java.JavaGapicLanguageProvider
-  input_element_view: io.gapi.vgen.InterfaceView
+- codegen_provider: com.google.api.codegen.java.JavaGapicProvider
+  input_element_view: com.google.api.codegen.InterfaceView
   snippet_files:
   - main.snip
   - settings.snip
diff --git a/gapic/lang/php_gapic.yaml b/gapic/lang/php_gapic.yaml
index 2b962ec4a..34a59a2ae 100644
--- a/gapic/lang/php_gapic.yaml
+++ b/gapic/lang/php_gapic.yaml
@@ -1,7 +1,7 @@
-type: io.gapi.vgen.ConfigProto
+type: com.google.api.codegen.ConfigProto
 language: php
 templates:
-- language_provider: io.gapi.vgen.php.PhpGapicLanguageProvider
-  input_element_view: io.gapi.vgen.InterfaceView
+- codegen_provider: com.google.api.codegen.php.PhpGapicProvider
+  input_element_view: com.google.api.codegen.InterfaceView
   snippet_files:
   - main.snip
diff --git a/gapic/lang/python_gapic.yaml b/gapic/lang/python_gapic.yaml
index f5c88f99e..22c7f9f43 100644
--- a/gapic/lang/python_gapic.yaml
+++ b/gapic/lang/python_gapic.yaml
@@ -1,11 +1,11 @@
-type: io.gapi.vgen.ConfigProto
+type: com.google.api.codegen.ConfigProto
 language: python
 templates:
-- language_provider: io.gapi.vgen.py.PythonGapicLanguageProvider
-  input_element_view: io.gapi.vgen.py.PythonInterfaceView
+- codegen_provider: com.google.api.codegen.py.PythonGapicProvider
+  input_element_view: com.google.api.codegen.py.PythonInterfaceView
   snippet_files:
   - main.snip
-- language_provider: io.gapi.vgen.py.PythonGapicLanguageProvider
-  input_element_view: io.gapi.vgen.py.PythonProtoFileView
+- codegen_provider: com.google.api.codegen.py.PythonGapicProvider
+  input_element_view: com.google.api.codegen.py.PythonProtoFileView
   snippet_files:
   - message.snip
diff --git a/gapic/lang/ruby_gapic.yaml b/gapic/lang/ruby_gapic.yaml
index 74fb2bbf7..6f3cb6d97 100644
--- a/gapic/lang/ruby_gapic.yaml
+++ b/gapic/lang/ruby_gapic.yaml
@@ -1,12 +1,11 @@
-type: io.gapi.vgen.ConfigProto
+type: com.google.api.codegen.ConfigProto
 language: ruby
-language_provider: io.gapi.vgen.ruby.RubyGapicLanguageProvider
 templates:
-- language_provider: io.gapi.vgen.ruby.RubyGapicLanguageProvider
-  input_element_view: io.gapi.vgen.InterfaceView
+- codegen_provider: com.google.api.codegen.ruby.RubyGapicProvider
+  input_element_view: com.google.api.codegen.InterfaceView
   snippet_files:
   - main.snip
-- language_provider: io.gapi.vgen.ruby.RubyGapicLanguageProvider
-  input_element_view: io.gapi.vgen.ProtoFileView
+- codegen_provider: com.google.api.codegen.ruby.RubyGapicProvider
+  input_element_view: com.google.api.codegen.ProtoFileView
   snippet_files:
   - message.snip