diff --git a/Makefile.in b/Makefile.in
index 307f0ff..08880d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -352,13 +352,29 @@ nobase_dist_pkgdata_DATA = \
 	templs/alias-rename-form.html.ep \
 	templs/alias-rename-handler.html.ep \
 	\
-	templs/forward-list.html.ep \
-	templs/forward-add-form.html.ep \
-	templs/forward-add-handler.html.ep \
-	templs/forward-update-form.html.ep \
-	templs/forward-update-handler.html.ep \
-	templs/forward-delete-form.html.ep \
-	templs/forward-delete-handler.html.ep \
+	templs/forwarded-list.html.ep \
+	templs/forwarded-add-form.html.ep \
+	templs/forwarded-add-handler.html.ep \
+	templs/forwarded-update-form.html.ep \
+	templs/forwarded-update-handler.html.ep \
+	templs/forwarded-delete-form.html.ep \
+	templs/forwarded-delete-handler.html.ep \
+	\
+	templs/unwanted-list.html.ep \
+	templs/unwanted-add-form.html.ep \
+	templs/unwanted-add-handler.html.ep \
+	templs/unwanted-update-form.html.ep \
+	templs/unwanted-update-handler.html.ep \
+	templs/unwanted-delete-form.html.ep \
+	templs/unwanted-delete-handler.html.ep \
+	\
+	templs/trusted-list.html.ep \
+	templs/trusted-add-form.html.ep \
+	templs/trusted-add-handler.html.ep \
+	templs/trusted-update-form.html.ep \
+	templs/trusted-update-handler.html.ep \
+	templs/trusted-delete-form.html.ep \
+	templs/trusted-delete-handler.html.ep \
 	\
 	templs/exception.development.html.ep \
 	templs/exception.production.html.ep \
diff --git a/schema.sql b/schema.sql
index 134f56d..65aa33d 100644
--- a/schema.sql
+++ b/schema.sql
@@ -20,9 +20,19 @@ CREATE TABLE aliases (
     domain_id int,
     list text
 );
-CREATE TABLE forwards (
+CREATE TABLE forwarded (
     id int unique NOT NULL PRIMARY KEY,
     name text unique
 );
 
+CREATE TABLE unwanted (
+    id int unique NOT NULL PRIMARY KEY,
+    name text unique
+);
+CREATE TABLE trusted (
+    id int unique NOT NULL PRIMARY KEY,
+    name text unique
+);
+
+
 COMMIT;
diff --git a/templs/trusted-add-form.html.ep b/templs/trusted-add-form.html.ep
index 9c95177..f204387 100644
--- a/templs/trusted-add-form.html.ep
+++ b/templs/trusted-add-form.html.ep
@@ -13,7 +13,7 @@
       <div class="medium-6 medium-centered cell">
 
         <form accept-charset="UTF-8" action="/trusted/add/handler" method="get" data-abide novalidate>
-            <h5 class="text-center">Add trusteded host</h5>
+            <h5 class="text-center">Add trusted host</h5>
             <label>Host name
                 <input type="text" name="trusted_name" placeholder="host.org" required pattern="[_.-zA-Z0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{5,42}"/>
                 <span class="form-error">Mandatory, 5 or more letter</span>