diff --git a/examples/data-sources/routeros_firewall/data-source.tf b/examples/data-sources/routeros_firewall/data-source.tf
deleted file mode 100644
index f6aaba79..00000000
--- a/examples/data-sources/routeros_firewall/data-source.tf
+++ /dev/null
@@ -1,32 +0,0 @@
-data "routeros_firewall" "fw" {
-  rules {
-    filter = {
-      chain = "input"
-      comment = "rule_2"
-    }
-  }
-
-  rules {
-    filter = {
-      chain = "forward"
-    }
-  }
-
-  nat {}
-}
-
-output "rules" {
-  value = [for value in data.routeros_firewall.fw.rules: [value.id, value.src_address]]
-}
-
-output "nat" {
-  value = [for value in data.routeros_firewall.fw.nat: [value.id, value.comment]]
-}
-
-resource "routeros_firewall" "rule_3" {
-  action = "accept"
-  chain  = "input"
-  comment = "rule_3"
-  src_address = "192.168.0.5"
-  place_before = "${data.routeros_firewall_filter.fw.rules[0].id}"
-}
diff --git a/examples/data-sources/routeros_ip_firewall/data-source.tf b/examples/data-sources/routeros_ip_firewall/data-source.tf
new file mode 100644
index 00000000..714a7bbf
--- /dev/null
+++ b/examples/data-sources/routeros_ip_firewall/data-source.tf
@@ -0,0 +1,32 @@
+data "routeros_ip_firewall" "fw" {
+  rules {
+    filter = {
+      chain = "input"
+      comment = "rule_2"
+    }
+  }
+
+  rules {
+    filter = {
+      chain = "forward"
+    }
+  }
+
+  nat {}
+}
+
+output "rules" {
+  value = [for value in data.routeros_ip_firewall.fw.rules: [value.id, value.src_address]]
+}
+
+output "nat" {
+  value = [for value in data.routeros_ip_firewall.fw.nat: [value.id, value.comment]]
+}
+
+resource "routeros_ip_firewall" "rule_3" {
+  action = "accept"
+  chain  = "input"
+  comment = "rule_3"
+  src_address = "192.168.0.5"
+  place_before = "${data.routeros_ip_firewall_filter.fw.rules[0].id}"
+}
diff --git a/routeros/datasource_ip_firewall.go b/routeros/datasource_ip_firewall.go
index 3fc4a04b..d0d081a6 100644
--- a/routeros/datasource_ip_firewall.go
+++ b/routeros/datasource_ip_firewall.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-var ipfirewallSections = []string{"address_list", "nat", "mangle", "rules"}
+var ipFirewallSections = []string{"address_list", "nat", "mangle", "rules"}
 
 func DatasourceIPFirewall() *schema.Resource {
 	return &schema.Resource{
@@ -34,7 +34,7 @@ func datasourceIPFirewallFilterRead(ctx context.Context, d *schema.ResourceData,
 	s := DatasourceIPFirewall().Schema
 
 	var isEmpty = true
-	for _, section := range ipfirewallSections {
+	for _, section := range ipFirewallSections {
 		isEmpty = isEmpty && len(d.Get(section).([]interface{})) == 0
 	}
 
@@ -49,7 +49,7 @@ func datasourceIPFirewallFilterRead(ctx context.Context, d *schema.ResourceData,
 		}
 	}
 
-	for _, section := range ipfirewallSections {
+	for _, section := range ipFirewallSections {
 		if len(d.Get(section).([]interface{})) == 0 {
 			continue
 		}
diff --git a/templates/data-sources/firewall.md.tmpl b/templates/data-sources/firewall.md.tmpl
new file mode 100644
index 00000000..7f8d0822
--- /dev/null
+++ b/templates/data-sources/firewall.md.tmpl
@@ -0,0 +1,5 @@
+# {{.Name}} ({{.Type}})
+---
+
+#### This is an alias for backwards compatibility between plugin versions. 
+Please see documentation for [routeros_ip_firewall](ip_firewall.md)