diff --git a/apps/cf_http/lib/cf_http/devices/device.ex b/apps/cf_http/lib/cf_http/devices/device.ex
index 8e4d8e242..b83740905 100644
--- a/apps/cf_http/lib/cf_http/devices/device.ex
+++ b/apps/cf_http/lib/cf_http/devices/device.ex
@@ -12,7 +12,7 @@ defmodule CfHttp.Devices.Device do
     field :verified_at, :utc_datetime
     field :user_id, :id
 
-    has_many :firewall_rules, CfHttp.FirewallRules.FirewallRule
+    has_many :rules, CfHttp.Rules.Rule
 
     timestamps()
   end
diff --git a/apps/cf_http/lib/cf_http/rules.ex b/apps/cf_http/lib/cf_http/rules.ex
index 7be333dd1..6696f0776 100644
--- a/apps/cf_http/lib/cf_http/rules.ex
+++ b/apps/cf_http/lib/cf_http/rules.ex
@@ -1,104 +1,104 @@
-defmodule CfHttp.FirewallRules do
+defmodule CfHttp.Rules do
   @moduledoc """
-  The FirewallRules context.
+  The Rules context.
   """
 
   import Ecto.Query, warn: false
   alias CfHttp.Repo
 
-  alias CfHttp.FirewallRules.FirewallRule
+  alias CfHttp.Rules.Rule
 
   @doc """
-  Returns the list of firewall_rules.
+  Returns the list of rules.
 
   ## Examples
 
-      iex> list_firewall_rules()
-      [%FirewallRule{}, ...]
+      iex> list_rules()
+      [%Rule{}, ...]
 
   """
-  def list_firewall_rules do
-    Repo.all(FirewallRule)
+  def list_rules do
+    Repo.all(Rule)
   end
 
   @doc """
-  Gets a single firewall_rule.
+  Gets a single rule.
 
-  Raises `Ecto.NoResultsError` if the Firewall rule does not exist.
+  Raises `Ecto.NoResultsError` if the Rule does not exist.
 
   ## Examples
 
-      iex> get_firewall_rule!(123)
-      %FirewallRule{}
+      iex> get_rule!(123)
+      %Rule{}
 
-      iex> get_firewall_rule!(456)
+      iex> get_rule!(456)
       ** (Ecto.NoResultsError)
 
   """
-  def get_firewall_rule!(id), do: Repo.get!(FirewallRule, id)
+  def get_rule!(id), do: Repo.get!(Rule, id)
 
   @doc """
-  Creates a firewall_rule.
+  Creates a rule.
 
   ## Examples
 
-      iex> create_firewall_rule(%{field: value})
-      {:ok, %FirewallRule{}}
+      iex> create_rule(%{field: value})
+      {:ok, %Rule{}}
 
-      iex> create_firewall_rule(%{field: bad_value})
+      iex> create_rule(%{field: bad_value})
       {:error, %Ecto.Changeset{}}
 
   """
-  def create_firewall_rule(attrs \\ %{}) do
-    %FirewallRule{}
-    |> FirewallRule.changeset(attrs)
+  def create_rule(attrs \\ %{}) do
+    %Rule{}
+    |> Rule.changeset(attrs)
     |> Repo.insert()
   end
 
   @doc """
-  Updates a firewall_rule.
+  Updates a rule.
 
   ## Examples
 
-      iex> update_firewall_rule(firewall_rule, %{field: new_value})
-      {:ok, %FirewallRule{}}
+      iex> update_rule(rule, %{field: new_value})
+      {:ok, %Rule{}}
 
-      iex> update_firewall_rule(firewall_rule, %{field: bad_value})
+      iex> update_rule(rule, %{field: bad_value})
       {:error, %Ecto.Changeset{}}
 
   """
-  def update_firewall_rule(%FirewallRule{} = firewall_rule, attrs) do
-    firewall_rule
-    |> FirewallRule.changeset(attrs)
+  def update_rule(%Rule{} = rule, attrs) do
+    rule
+    |> Rule.changeset(attrs)
     |> Repo.update()
   end
 
   @doc """
-  Deletes a firewall_rule.
+  Deletes a rule.
 
   ## Examples
 
-      iex> delete_firewall_rule(firewall_rule)
-      {:ok, %FirewallRule{}}
+      iex> delete_rule(rule)
+      {:ok, %Rule{}}
 
-      iex> delete_firewall_rule(firewall_rule)
+      iex> delete_rule(rule)
       {:error, %Ecto.Changeset{}}
 
   """
-  def delete_firewall_rule(%FirewallRule{} = firewall_rule) do
-    Repo.delete(firewall_rule)
+  def delete_rule(%Rule{} = rule) do
+    Repo.delete(rule)
   end
 
   @doc """
-  Returns an `%Ecto.Changeset{}` for tracking firewall_rule changes.
+  Returns an `%Ecto.Changeset{}` for tracking rule changes.
 
   ## Examples
 
-      iex> change_firewall_rule(firewall_rule)
-      %Ecto.Changeset{source: %FirewallRule{}}
+      iex> change_rule(rule)
+      %Ecto.Changeset{source: %Rule{}}
 
   """
-  def change_firewall_rule(%FirewallRule{} = firewall_rule) do
-    FirewallRule.changeset(firewall_rule, %{})
+  def change_rule(%Rule{} = rule) do
+    Rule.changeset(rule, %{})
   end
 end
diff --git a/apps/cf_http/lib/cf_http/rules/rule.ex b/apps/cf_http/lib/cf_http/rules/rule.ex
index b134879ba..254512913 100644
--- a/apps/cf_http/lib/cf_http/rules/rule.ex
+++ b/apps/cf_http/lib/cf_http/rules/rule.ex
@@ -1,4 +1,4 @@
-defmodule CfHttp.FirewallRules.FirewallRule do
+defmodule CfHttp.Rules.Rule do
   @moduledoc """
   Not really sure what to write here. I'll update this later.
   """
@@ -6,7 +6,7 @@ defmodule CfHttp.FirewallRules.FirewallRule do
   use Ecto.Schema
   import Ecto.Changeset
 
-  schema "firewall_rules" do
+  schema "rules" do
     field :destination, :string
     field :enabled, :boolean, default: false
     field :port, :string
@@ -18,8 +18,8 @@ defmodule CfHttp.FirewallRules.FirewallRule do
   end
 
   @doc false
-  def changeset(firewall_rule, attrs) do
-    firewall_rule
+  def changeset(rule, attrs) do
+    rule
     |> cast(attrs, [:destination, :port, :protocol, :enabled])
     |> validate_required([:destination, :port, :protocol, :enabled])
   end
diff --git a/apps/cf_http/lib/cf_http_web/controllers/rule_controller.ex b/apps/cf_http/lib/cf_http_web/controllers/rule_controller.ex
index 17884adae..8838ebf0e 100644
--- a/apps/cf_http/lib/cf_http_web/controllers/rule_controller.ex
+++ b/apps/cf_http/lib/cf_http_web/controllers/rule_controller.ex
@@ -1,35 +1,35 @@
-defmodule CfHttpWeb.FirewallRuleController do
+defmodule CfHttpWeb.RuleController do
   @moduledoc """
-  Controller logic for FirewallRules
+  Controller logic for Rules
   """
 
   use CfHttpWeb, :controller
 
   alias CfHttp.Devices
-  alias CfHttp.FirewallRules
-  alias CfHttp.FirewallRules.FirewallRule
+  alias CfHttp.Rules
+  alias CfHttp.Rules.Rule
 
   plug CfHttpWeb.Plugs.Authenticator
 
   def index(conn, %{"device_id" => device_id}) do
     device = Devices.get_device!(device_id)
 
-    render(conn, "index.html", device: device, firewall_rules: device.firewall_rules)
+    render(conn, "index.html", device: device, rules: device.rules)
   end
 
   def new(conn, %{"device_id" => device_id}) do
     device = Devices.get_device!(device_id)
 
-    changeset = FirewallRules.change_firewall_rule(%FirewallRule{device_id: device_id})
+    changeset = Rules.change_rule(%Rule{device_id: device_id})
     render(conn, "new.html", changeset: changeset, device: device)
   end
 
-  def create(conn, %{"firewall_rule" => firewall_rule_params}) do
-    case FirewallRules.create_firewall_rule(firewall_rule_params) do
-      {:ok, firewall_rule} ->
+  def create(conn, %{"rule" => rule_params}) do
+    case Rules.create_rule(rule_params) do
+      {:ok, rule} ->
         conn
-        |> put_flash(:info, "Firewall rule created successfully.")
-        |> redirect(to: Routes.firewall_rule_path(conn, :show, firewall_rule))
+        |> put_flash(:info, "Rule created successfully.")
+        |> redirect(to: Routes.rule_path(conn, :show, rule))
 
       {:error, %Ecto.Changeset{} = changeset} ->
         render(conn, "new.html", changeset: changeset)
@@ -37,36 +37,36 @@ defmodule CfHttpWeb.FirewallRuleController do
   end
 
   def show(conn, %{"id" => id}) do
-    firewall_rule = FirewallRules.get_firewall_rule!(id)
-    render(conn, "show.html", firewall_rule: firewall_rule)
+    rule = Rules.get_rule!(id)
+    render(conn, "show.html", rule: rule)
   end
 
   def edit(conn, %{"id" => id}) do
-    firewall_rule = FirewallRules.get_firewall_rule!(id)
-    changeset = FirewallRules.change_firewall_rule(firewall_rule)
-    render(conn, "edit.html", firewall_rule: firewall_rule, changeset: changeset)
+    rule = Rules.get_rule!(id)
+    changeset = Rules.change_rule(rule)
+    render(conn, "edit.html", rule: rule, changeset: changeset)
   end
 
-  def update(conn, %{"id" => id, "firewall_rule" => firewall_rule_params}) do
-    firewall_rule = FirewallRules.get_firewall_rule!(id)
+  def update(conn, %{"id" => id, "rule" => rule_params}) do
+    rule = Rules.get_rule!(id)
 
-    case FirewallRules.update_firewall_rule(firewall_rule, firewall_rule_params) do
-      {:ok, firewall_rule} ->
+    case Rules.update_rule(rule, rule_params) do
+      {:ok, rule} ->
         conn
-        |> put_flash(:info, "Firewall rule updated successfully.")
-        |> redirect(to: Routes.firewall_rule_path(conn, :show, firewall_rule))
+        |> put_flash(:info, "Rule updated successfully.")
+        |> redirect(to: Routes.rule_path(conn, :show, rule))
 
       {:error, %Ecto.Changeset{} = changeset} ->
-        render(conn, "edit.html", firewall_rule: firewall_rule, changeset: changeset)
+        render(conn, "edit.html", rule: rule, changeset: changeset)
     end
   end
 
   def delete(conn, %{"id" => id}) do
-    firewall_rule = FirewallRules.get_firewall_rule!(id)
-    {:ok, _firewall_rule} = FirewallRules.delete_firewall_rule(firewall_rule)
+    rule = Rules.get_rule!(id)
+    {:ok, _rule} = Rules.delete_rule(rule)
 
     conn
-    |> put_flash(:info, "Firewall rule deleted successfully.")
-    |> redirect(to: Routes.firewall_rule_path(conn, :index, firewall_rule.device))
+    |> put_flash(:info, "Rule deleted successfully.")
+    |> redirect(to: Routes.rule_path(conn, :index, rule.device))
   end
 end
diff --git a/apps/cf_http/lib/cf_http_web/router.ex b/apps/cf_http/lib/cf_http_web/router.ex
index 84a8d6f22..9239afc28 100644
--- a/apps/cf_http/lib/cf_http_web/router.ex
+++ b/apps/cf_http/lib/cf_http_web/router.ex
@@ -22,10 +22,10 @@ defmodule CfHttpWeb.Router do
     resources "/users", UserController, only: [:new, :create]
 
     resources "/devices", DeviceController, except: [:create] do
-      resources "/firewall_rules", FirewallRuleController, only: [:new, :index, :create]
+      resources "/rules", RuleController, only: [:new, :index, :create]
     end
 
-    resources "/firewall_rules", FirewallRuleController, only: [:show, :update, :delete, :edit]
+    resources "/rules", RuleController, only: [:show, :update, :delete, :edit]
   end
 
   # Other scopes may use custom stacks.
diff --git a/apps/cf_http/lib/cf_http_web/templates/rule/edit.html.eex b/apps/cf_http/lib/cf_http_web/templates/rule/edit.html.eex
index b2b99434e..e49613818 100644
--- a/apps/cf_http/lib/cf_http_web/templates/rule/edit.html.eex
+++ b/apps/cf_http/lib/cf_http_web/templates/rule/edit.html.eex
@@ -1,5 +1,5 @@
-<h1>Edit Firewall rule</h1>
+<h1>Edit Rule</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.firewall_rule_path(@conn, :update, @firewall_rule)) %>
+<%= render "form.html", Map.put(assigns, :action, Routes.rule_path(@conn, :update, @rule)) %>
 
-<span><%= link "Back", to: Routes.firewall_rule_path(@conn, :index, @firewall_rule.device) %></span>
+<span><%= link "Back", to: Routes.rule_path(@conn, :index, @rule.device) %></span>
diff --git a/apps/cf_http/lib/cf_http_web/templates/rule/index.html.eex b/apps/cf_http/lib/cf_http_web/templates/rule/index.html.eex
index b2b0a0849..0c49c8fa4 100644
--- a/apps/cf_http/lib/cf_http_web/templates/rule/index.html.eex
+++ b/apps/cf_http/lib/cf_http_web/templates/rule/index.html.eex
@@ -1,4 +1,4 @@
-<h1>Listing Firewall rules</h1>
+<h1>Listing Rules</h1>
 
 <table>
   <thead>
@@ -12,21 +12,21 @@
     </tr>
   </thead>
   <tbody>
-<%= for firewall_rule <- @firewall_rules do %>
+<%= for rule <- @rules do %>
     <tr>
-      <td><%= firewall_rule.destination %></td>
-      <td><%= firewall_rule.port %></td>
-      <td><%= firewall_rule.protocol %></td>
-      <td><%= firewall_rule.enabled %></td>
+      <td><%= rule.destination %></td>
+      <td><%= rule.port %></td>
+      <td><%= rule.protocol %></td>
+      <td><%= rule.enabled %></td>
 
       <td>
-        <span><%= link "Show", to: Routes.firewall_rule_path(@conn, :show, firewall_rule) %></span>
-        <span><%= link "Edit", to: Routes.firewall_rule_path(@conn, :edit, firewall_rule) %></span>
-        <span><%= link "Delete", to: Routes.firewall_rule_path(@conn, :delete, firewall_rule), method: :delete, data: [confirm: "Are you sure?"] %></span>
+        <span><%= link "Show", to: Routes.rule_path(@conn, :show, rule) %></span>
+        <span><%= link "Edit", to: Routes.rule_path(@conn, :edit, rule) %></span>
+        <span><%= link "Delete", to: Routes.rule_path(@conn, :delete, rule), method: :delete, data: [confirm: "Are you sure?"] %></span>
       </td>
     </tr>
 <% end %>
   </tbody>
 </table>
 
-<span><%= link "New Firewall rule", to: Routes.firewall_rule_path(@conn, :new, @device) %></span>
+<span><%= link "New Rule", to: Routes.rule_path(@conn, :new, @device) %></span>
diff --git a/apps/cf_http/lib/cf_http_web/templates/rule/new.html.eex b/apps/cf_http/lib/cf_http_web/templates/rule/new.html.eex
index ca0b2c400..5c88667cd 100644
--- a/apps/cf_http/lib/cf_http_web/templates/rule/new.html.eex
+++ b/apps/cf_http/lib/cf_http_web/templates/rule/new.html.eex
@@ -1,5 +1,5 @@
-<h1>New Firewall rule</h1>
+<h1>New Rule</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.firewall_rule_path(@conn, :create, @device)) %>
+<%= render "form.html", Map.put(assigns, :action, Routes.rule_path(@conn, :create, @device)) %>
 
-<span><%= link "Back", to: Routes.firewall_rule_path(@conn, :index, @device) %></span>
+<span><%= link "Back", to: Routes.rule_path(@conn, :index, @device) %></span>
diff --git a/apps/cf_http/lib/cf_http_web/templates/rule/show.html.eex b/apps/cf_http/lib/cf_http_web/templates/rule/show.html.eex
index d32be268d..6c785c6bb 100644
--- a/apps/cf_http/lib/cf_http_web/templates/rule/show.html.eex
+++ b/apps/cf_http/lib/cf_http_web/templates/rule/show.html.eex
@@ -1,28 +1,28 @@
-<h1>Show Firewall rule</h1>
+<h1>Show Rule</h1>
 
 <ul>
 
   <li>
     <strong>Destination:</strong>
-    <%= @firewall_rule.destination %>
+    <%= @rule.destination %>
   </li>
 
   <li>
     <strong>Port:</strong>
-    <%= @firewall_rule.port %>
+    <%= @rule.port %>
   </li>
 
   <li>
     <strong>Protocol:</strong>
-    <%= @firewall_rule.protocol %>
+    <%= @rule.protocol %>
   </li>
 
   <li>
     <strong>Enabled:</strong>
-    <%= @firewall_rule.enabled %>
+    <%= @rule.enabled %>
   </li>
 
 </ul>
 
-<span><%= link "Edit", to: Routes.firewall_rule_path(@conn, :edit, @firewall_rule) %></span>
-<span><%= link "Back", to: Routes.firewall_rule_path(@conn, :index, @firewall_rule.device) %></span>
+<span><%= link "Edit", to: Routes.rule_path(@conn, :edit, @rule) %></span>
+<span><%= link "Back", to: Routes.rule_path(@conn, :index, @rule.device) %></span>
diff --git a/apps/cf_http/lib/cf_http_web/views/rule_view.ex b/apps/cf_http/lib/cf_http_web/views/rule_view.ex
index e873be9b3..d354a584f 100644
--- a/apps/cf_http/lib/cf_http_web/views/rule_view.ex
+++ b/apps/cf_http/lib/cf_http_web/views/rule_view.ex
@@ -1,3 +1,3 @@
-defmodule CfHttpWeb.FirewallRuleView do
+defmodule CfHttpWeb.RuleView do
   use CfHttpWeb, :view
 end
diff --git a/apps/cf_http/priv/repo/migrations/20200228154815_create_rules.exs b/apps/cf_http/priv/repo/migrations/20200228154815_create_rules.exs
index 40a2456d2..a39328eb2 100644
--- a/apps/cf_http/priv/repo/migrations/20200228154815_create_rules.exs
+++ b/apps/cf_http/priv/repo/migrations/20200228154815_create_rules.exs
@@ -1,8 +1,8 @@
-defmodule CfHttp.Repo.Migrations.CreateFirewallRules do
+defmodule CfHttp.Repo.Migrations.CreateRules do
   use Ecto.Migration
 
   def change do
-    create table(:firewall_rules) do
+    create table(:rules) do
       add :destination, :inet
       add :port, :string
       add :protocol, :string
@@ -12,6 +12,6 @@ defmodule CfHttp.Repo.Migrations.CreateFirewallRules do
       timestamps()
     end
 
-    create index(:firewall_rules, [:device_id])
+    create index(:rules, [:device_id])
   end
 end
diff --git a/apps/cf_http/test/cf_http/rules_test.exs b/apps/cf_http/test/cf_http/rules_test.exs
index 0101d51c6..7222a43cc 100644
--- a/apps/cf_http/test/cf_http/rules_test.exs
+++ b/apps/cf_http/test/cf_http/rules_test.exs
@@ -1,6 +1,6 @@
-defmodule CfHttp.FirewallRulesTest do
+defmodule CfHttp.RulesTest do
   use CfHttp.DataCase
 
-  describe "firewall_rules" do
+  describe "rules" do
   end
 end
diff --git a/apps/cf_http/test/cf_http_web/controllers/rule_controller_test.exs b/apps/cf_http/test/cf_http_web/controllers/rule_controller_test.exs
index fc836c691..5c36eb39a 100644
--- a/apps/cf_http/test/cf_http_web/controllers/rule_controller_test.exs
+++ b/apps/cf_http/test/cf_http_web/controllers/rule_controller_test.exs
@@ -1,21 +1,21 @@
-defmodule CfHttpWeb.FirewallRuleControllerTest do
+defmodule CfHttpWeb.RuleControllerTest do
   use CfHttpWeb.ConnCase
 
   describe "index" do
   end
 
-  describe "new firewall_rule" do
+  describe "new rule" do
   end
 
-  describe "create firewall_rule" do
+  describe "create rule" do
   end
 
-  describe "edit firewall_rule" do
+  describe "edit rule" do
   end
 
-  describe "update firewall_rule" do
+  describe "update rule" do
   end
 
-  describe "delete firewall_rule" do
+  describe "delete rule" do
   end
 end