diff --git a/examples/resources/routeros_certificate_scep_server/import.sh b/examples/resources/routeros_system_certificate_scep_server/import.sh
similarity index 60%
rename from examples/resources/routeros_certificate_scep_server/import.sh
rename to examples/resources/routeros_system_certificate_scep_server/import.sh
index da6a9547..1b7d278f 100644
--- a/examples/resources/routeros_certificate_scep_server/import.sh
+++ b/examples/resources/routeros_system_certificate_scep_server/import.sh
@@ -1,3 +1,3 @@
 # The ID can be found via API or the terminal
 # The command for the terminal is -> /certificate/scep-server/print show-ids
-terraform import routeros_certificate_scep_server.example_scep_server "*1"
+terraform import routeros_system_certificate_scep_server.example_scep_server "*1"
diff --git a/examples/resources/routeros_certificate_scep_server/resource.tf b/examples/resources/routeros_system_certificate_scep_server/resource.tf
similarity index 70%
rename from examples/resources/routeros_certificate_scep_server/resource.tf
rename to examples/resources/routeros_system_certificate_scep_server/resource.tf
index 8b56adc5..42cd4828 100644
--- a/examples/resources/routeros_certificate_scep_server/resource.tf
+++ b/examples/resources/routeros_system_certificate_scep_server/resource.tf
@@ -7,7 +7,8 @@ resource "routeros_system_certificate" "example_root_ca" {
   }
 }
 
-resource "routeros_certificate_scep_server" "example_scep_server" {
+# You can also use the alias "routeros_certificate_scep_server"
+resource "routeros_system_certificate_scep_server" "example_scep_server" {
   ca_cert    = routeros_system_certificate.example_root_ca.name
   path       = "/scep/example_scep_server"
   days_valid = 30
diff --git a/routeros/provider.go b/routeros/provider.go
index 8d41a672..35d5c8a4 100644
--- a/routeros/provider.go
+++ b/routeros/provider.go
@@ -171,21 +171,22 @@ func Provider() *schema.Provider {
 			"routeros_wireguard_peer": ResourceInterfaceWireguardPeer(),
 
 			// System Objects
-			"routeros_ip_cloud":                ResourceIpCloud(),
-			"routeros_ip_cloud_advanced":       ResourceIpCloudAdvanced(),
-			"routeros_system_certificate":      ResourceSystemCertificate(),
-			"routeros_certificate_scep_server": ResourceCertificateScepServer(),
-			"routeros_system_clock":            ResourceSystemClock(),
-			"routeros_system_identity":         ResourceSystemIdentity(),
-			"routeros_system_logging":          ResourceSystemLogging(),
-			"routeros_system_ntp_client":       ResourceSystemNtpClient(),
-			"routeros_system_ntp_server":       ResourceSystemNtpServer(),
-			"routeros_system_scheduler":        ResourceSystemScheduler(),
-			"routeros_system_script":           ResourceSystemScript(),
-			"routeros_system_user":             ResourceUser(),
-			"routeros_system_user_aaa":         ResourceUserAaa(),
-			"routeros_system_user_group":       ResourceUserGroup(),
-			"routeros_system_user_settings":    ResourceSystemUserSettings(),
+			"routeros_ip_cloud":                       ResourceIpCloud(),
+			"routeros_ip_cloud_advanced":              ResourceIpCloudAdvanced(),
+			"routeros_system_certificate":             ResourceSystemCertificate(),
+			"routeros_system_certificate_scep_server": ResourceCertificateScepServer(),
+			"routeros_certificate_scep_server":        ResourceCertificateScepServer(),
+			"routeros_system_clock":                   ResourceSystemClock(),
+			"routeros_system_identity":                ResourceSystemIdentity(),
+			"routeros_system_logging":                 ResourceSystemLogging(),
+			"routeros_system_ntp_client":              ResourceSystemNtpClient(),
+			"routeros_system_ntp_server":              ResourceSystemNtpServer(),
+			"routeros_system_scheduler":               ResourceSystemScheduler(),
+			"routeros_system_script":                  ResourceSystemScript(),
+			"routeros_system_user":                    ResourceUser(),
+			"routeros_system_user_aaa":                ResourceUserAaa(),
+			"routeros_system_user_group":              ResourceUserGroup(),
+			"routeros_system_user_settings":           ResourceSystemUserSettings(),
 
 			// Aliases for system objects to retain compatibility between original and fork
 			"routeros_identity":  ResourceSystemIdentity(),
diff --git a/routeros/resource_certificate_scep_server.go b/routeros/resource_system_certificate_scep_server.go
similarity index 100%
rename from routeros/resource_certificate_scep_server.go
rename to routeros/resource_system_certificate_scep_server.go
diff --git a/routeros/resource_certificate_scep_server_test.go b/routeros/resource_system_certificate_scep_server_test.go
similarity index 100%
rename from routeros/resource_certificate_scep_server_test.go
rename to routeros/resource_system_certificate_scep_server_test.go
diff --git a/templates/resources/certificate_scep_server.md.tmpl b/templates/resources/certificate_scep_server.md.tmpl
new file mode 100644
index 00000000..f93438a2
--- /dev/null
+++ b/templates/resources/certificate_scep_server.md.tmpl
@@ -0,0 +1,5 @@
+# {{.Name}} ({{.Type}})
+---
+
+#### This is an alias for backwards compatibility between plugin versions. 
+Please see documentation for [routeros_system_certificate_scep_server](system_certificate_scep_server.md)