diff --git a/specs/device/dns.yaml b/specs/device/dns.yaml
index a1b44161..03e03b9a 100644
--- a/specs/device/dns.yaml
+++ b/specs/device/dns.yaml
@@ -1,6 +1,6 @@
 name: "DNS"
 terraform_provider_config:
-  suffix: "dns"
+  suffix: "dns_settings"
 go_sdk_config:
   package:
     - "device"
diff --git a/specs/device/ntp.yaml b/specs/device/ntp.yaml
index a512e942..2a203db6 100644
--- a/specs/device/ntp.yaml
+++ b/specs/device/ntp.yaml
@@ -1,6 +1,6 @@
 name: "NTP"
 terraform_provider_config:
-  suffix: "ntp"
+  suffix: "ntp_settings"
 go_sdk_config:
   package:
     - "device"
diff --git a/specs/objects/address.yaml b/specs/objects/address.yaml
index c1e672f3..58d7219c 100644
--- a/specs/objects/address.yaml
+++ b/specs/objects/address.yaml
@@ -3,8 +3,8 @@ terraform_provider_config:
   resource_type: entry
   resource_variants:
     - plural
-  suffix: "address_object"
-  plural_suffix: "address_objects"
+  suffix: "address"
+  plural_suffix: "addresses"
   plural_name: "addresses"
 go_sdk_config:
   package:
diff --git a/specs/objects/service.yaml b/specs/objects/service.yaml
index 72700fd7..6c35ebe1 100644
--- a/specs/objects/service.yaml
+++ b/specs/objects/service.yaml
@@ -1,6 +1,6 @@
 name: "Service"
 terraform_provider_config:
-  suffix: "service_object"
+  suffix: "service"
 go_sdk_config:
   package:
     - "objects"
diff --git a/specs/panorama/template-variable.yaml b/specs/panorama/template-variable.yaml
index bce867cf..2b1a2e0f 100644
--- a/specs/panorama/template-variable.yaml
+++ b/specs/panorama/template-variable.yaml
@@ -1,6 +1,6 @@
 name: "Template Variable"
 terraform_provider_config:
-  suffix: "panorama_template_variable"
+  suffix: "template_variable"
 go_sdk_config:
   package:
     - "panorama"
diff --git a/specs/panorama/template.yaml b/specs/panorama/template.yaml
index 6ab9b910..be078ac6 100644
--- a/specs/panorama/template.yaml
+++ b/specs/panorama/template.yaml
@@ -1,6 +1,6 @@
 name: "Template"
 terraform_provider_config:
-  suffix: "panorama_template"
+  suffix: "template"
 go_sdk_config:
   package:
     - "panorama"