diff --git a/asterisk/conf/pjsip_wizard_trunk_one.conf b/asterisk/conf/pjsip_trunk_one.conf
similarity index 67%
rename from asterisk/conf/pjsip_wizard_trunk_one.conf
rename to asterisk/conf/pjsip_trunk_one.conf
index 06b1388..6da06a5 100644
--- a/asterisk/conf/pjsip_wizard_trunk_one.conf
+++ b/asterisk/conf/pjsip_trunk_one.conf
@@ -1,13 +1,9 @@
 ;
-; /etc/asterisk/pjsip_wizard_trunk_one.conf
+; /etc/asterisk/pjsip_trunk_one.conf
 ;
 ; For a local system to register as a trunk.
 ;
 [trunk-one](trunk-defaults)
-
-; Local network address of trunk.
-remote_hosts = 192.168.255.2
-
 ; Accept inbound auth for this trunk.
 accepts_auth = yes
 
@@ -27,3 +23,12 @@ endpoint/context = from-trunk-one
 ; Only one registration please.
 aor/max_contacts = 1
 
+[trunk-one]
+; An identify block is needed for this trunk to match for incoming calls.
+type = identify
+
+; IP / hostname.
+match = 192.168.255.2
+
+; What endpoint does this identify block belong to?
+endpoint = trunk-one
diff --git a/asterisk/conf/pjsip_wizard_users.conf b/asterisk/conf/pjsip_users.conf
similarity index 96%
rename from asterisk/conf/pjsip_wizard_users.conf
rename to asterisk/conf/pjsip_users.conf
index a269d73..b975246 100644
--- a/asterisk/conf/pjsip_wizard_users.conf
+++ b/asterisk/conf/pjsip_users.conf
@@ -1,4 +1,5 @@
-; /etc/asterisk/pjsip_wizard_users.conf
+;
+; /etc/asterisk/pjsip_users.conf
 ;
 ; Modifed and "borrowed" (read: stolen) https://www.sacredheartsc.com/blog/building-a-personal-voip-system/
 ;
diff --git a/asterisk/conf/pjsip_wizard.conf b/asterisk/conf/pjsip_wizard.conf
index c5886a6..977f505 100644
--- a/asterisk/conf/pjsip_wizard.conf
+++ b/asterisk/conf/pjsip_wizard.conf
@@ -48,8 +48,8 @@ endpoint/subscribe_context = subscribe
 
 ;
 ; Load user extensions. 
-#tryinclude pjsip_wizard_users.conf
+#tryinclude pjsip_users.conf
 
 ; Load trunks.
-#tryinclude pjsip_wizard_trunk_one.conf
+#tryinclude pjsip_trunk_one.conf