rename kazoo_number_manager to kazoo_numbers (2600hz#6159)

Renaming kazoo_number_manager to shorter name kazoo_numbers. This should be almost transparent to the client users. Applications not included in KAZOO repo should do this rename if they are depending on knm app or include one of its header files. scripts/kz_diaspora.bash script has been updated to do this rename.
kagesys · Nov 18, 2019 · 0d2b69e · 0d2b69e
1 parent 0c341fe
commit 0d2b69e
Show file tree

Hide file tree

Showing 211 changed files with 150 additions and 140 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,9 +39,9 @@ applications/registrar/c_src/env.mk
 core/sup/sup
 .rebar/
 
-core/kazoo_number_manager/dialcodes.json
-core/kazoo_number_manager/src/knm_iso3166a2_itu.erl
-core/kazoo_number_manager/src/knm_iso3166_util.erl
+core/kazoo_numbers/dialcodes.json
+core/kazoo_numbers/src/knm_iso3166a2_itu.erl
+core/kazoo_numbers/src/knm_iso3166_util.erl
 
 make/erlang-formatter/
 /TAGS

diff --git a/applications/callflow/src/callflow.app.src b/applications/callflow/src/callflow.app.src
@@ -2,7 +2,7 @@
              [{applications,[crypto,kazoo,kazoo_amqp,kazoo_apps,kazoo_caches,
                              kazoo_call,kazoo_data,kazoo_documents,kazoo_edr,
                              kazoo_endpoint,kazoo_events,kazoo_globals,
-                             kazoo_media,kazoo_number_manager,kazoo_schemas,
+                             kazoo_media,kazoo_numbers,kazoo_schemas,
                              kazoo_stdlib,kazoo_token_buckets,
                              kazoo_translator,kazoo_voicemail,kazoo_web,
                              kernel,lager,stdlib]},

diff --git a/applications/callflow/src/callflow.hrl b/applications/callflow/src/callflow.hrl
@@ -2,7 +2,7 @@
 -include_lib("kazoo_stdlib/include/kz_types.hrl").
 -include_lib("kazoo_stdlib/include/kz_log.hrl").
 -include_lib("kazoo_amqp/include/kz_api_literals.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 -include_lib("kazoo_call/include/kapps_call_command_types.hrl").
 -include_lib("kazoo_documents/include/kazoo_documents.hrl").
 

diff --git a/applications/cccp/src/cccp.app.src b/applications/cccp/src/cccp.app.src
@@ -1,7 +1,7 @@
 {application,cccp,
              [{applications,[crossbar,kazoo,kazoo_amqp,kazoo_apps,kazoo_call,
                              kazoo_data,kazoo_documents,kazoo_endpoint,
-                             kazoo_media,kazoo_number_manager,kazoo_stdlib,
+                             kazoo_media,kazoo_numbers,kazoo_stdlib,
                              kernel,lager,stdlib]},
               {description,"CCCP - Calling Card Callback Platform"},
               {env,[{is_kazoo_app,true}]},

diff --git a/applications/cccp/src/cccp.hrl b/applications/cccp/src/cccp.hrl
@@ -3,7 +3,7 @@
 -include_lib("kazoo_stdlib/include/kz_types.hrl").
 -include_lib("kazoo_stdlib/include/kz_log.hrl").
 -include_lib("kazoo_stdlib/include/kz_databases.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(APP_NAME, <<"cccp">>).
 -define(APP_VERSION, <<"4.0.0">> ).

diff --git a/applications/crossbar/src/crossbar.app.src b/applications/crossbar/src/crossbar.app.src
@@ -5,7 +5,7 @@
                              kazoo_call,kazoo_config,kazoo_csv,kazoo_data,
                              kazoo_databases,kazoo_documents,kazoo_endpoint,
                              kazoo_fax,kazoo_globals,kazoo_ips,kazoo_ledgers,
-                             kazoo_media,kazoo_modb,kazoo_number_manager,
+                             kazoo_media,kazoo_modb,kazoo_numbers,
                              kazoo_oauth,kazoo_perf,kazoo_provisioner,
                              kazoo_schemas,kazoo_services,kazoo_sip,
                              kazoo_speech,kazoo_stdlib,kazoo_tasks,

diff --git a/applications/crossbar/src/crossbar_freeswitch.erl b/applications/crossbar/src/crossbar_freeswitch.erl
@@ -25,7 +25,7 @@
 -export([reset/0]).
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(SERVER, ?MODULE).
 

diff --git a/applications/crossbar/src/modules/cb_alerts.erl b/applications/crossbar/src/modules/cb_alerts.erl
@@ -28,7 +28,7 @@
 -endif.
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_port_request.hrl").
+-include_lib("kazoo_numbers/include/knm_port_request.hrl").
 
 -define(AVAILABLE_LIST, <<"alerts/available">>).
 

diff --git a/applications/crossbar/src/modules/cb_jobs_listener.erl b/applications/crossbar/src/modules/cb_jobs_listener.erl
@@ -25,7 +25,7 @@
         ]).
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(SERVER, ?MODULE).
 

diff --git a/applications/crossbar/src/modules/cb_port_requests.erl b/applications/crossbar/src/modules/cb_port_requests.erl
@@ -36,7 +36,7 @@
         ]).
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_port_request.hrl").
+-include_lib("kazoo_numbers/include/knm_port_request.hrl").
 
 -define(SCHEMA, <<"port_requests">>).
 -define(SCHEMA_TO_SCHEDULED, <<(?SCHEMA)/binary, ".to_scheduled">>).

diff --git a/applications/crossbar/src/modules/phonebook.erl b/applications/crossbar/src/modules/phonebook.erl
@@ -18,7 +18,7 @@
         ]).
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_port_request.hrl").
+-include_lib("kazoo_numbers/include/knm_port_request.hrl").
 
 -define(MOD_CONFIG_CAT, <<"crossbar.phonebook">>).
 

diff --git a/applications/crossbar/src/modules_v1/cb_phone_numbers_v1.erl b/applications/crossbar/src/modules_v1/cb_phone_numbers_v1.erl
@@ -26,7 +26,7 @@
         ]).
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(CB_LIST, <<"phone_numbers/crossbar_listing">>).
 

diff --git a/applications/crossbar/src/modules_v2/cb_devices_v2.erl b/applications/crossbar/src/modules_v2/cb_devices_v2.erl
@@ -30,7 +30,7 @@
         ]).
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(STATUS_PATH_TOKEN, <<"status">>).
 -define(CHECK_SYNC_PATH_TOKEN, <<"sync">>).

diff --git a/applications/crossbar/src/modules_v2/cb_phone_numbers_v2.erl b/applications/crossbar/src/modules_v2/cb_phone_numbers_v2.erl
@@ -28,7 +28,7 @@
         ]).
 
 -include("crossbar.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(CB_LIST, <<"phone_numbers/crossbar_listing">>).
 -define(PORT_NUM_LISTING, <<"port_requests/phone_numbers_listing">>).
@@ -336,14 +336,14 @@ classified_number(Context, Number, Classifier) ->
 -spec post(cb_context:context(), path_token(), path_token()) -> cb_context:context().
 post(Context, ?FIX, Num) ->
     AccountDb = cb_context:account_db(Context),
-    _ = kazoo_number_manager_maintenance:copy_single_number_to_account_db(Num, AccountDb),
+    _ = kazoo_numbers_maintenance:copy_single_number_to_account_db(Num, AccountDb),
     CB = fun() -> ?MODULE:post(cb_context:set_accepting_charges(Context), ?FIX, Num) end,
     set_response({'ok', kz_json:new()}, Context, CB).
 
 -spec post(cb_context:context(), path_token()) -> cb_context:context().
 post(Context, ?FIX) ->
     AccountDb = cb_context:account_db(Context),
-    _ = kazoo_number_manager_maintenance:fix_account_db_numbers(AccountDb),
+    _ = kazoo_numbers_maintenance:fix_account_db_numbers(AccountDb),
     summary(Context);
 post(Context, ?CHECK) ->
     Numbers = cb_context:req_value(Context, ?COLLECTION_NUMBERS),

diff --git a/applications/crossbar/test/cb_alerts_tests.erl b/applications/crossbar/test/cb_alerts_tests.erl
@@ -10,7 +10,7 @@
 -module(cb_alerts_tests).
 
 -include_lib("eunit/include/eunit.hrl").
--include_lib("kazoo_number_manager/include/knm_port_request.hrl"). %% PORT_SUSPENDED
+-include_lib("kazoo_numbers/include/knm_port_request.hrl"). %% PORT_SUSPENDED
 -include_lib("kazoo_stdlib/include/kz_types.hrl"). %% SECONDS_IN_DAY
 
 %%%=======================================================================================

diff --git a/applications/doodle/src/doodle.app.src b/applications/doodle/src/doodle.app.src
@@ -2,7 +2,7 @@
              [{applications,[callflow,kazoo,kazoo_amqp,kazoo_apps,
                              kazoo_bindings,kazoo_caches,kazoo_call,
                              kazoo_data,kazoo_documents,kazoo_endpoint,
-                             kazoo_modb,kazoo_number_manager,kazoo_stdlib,
+                             kazoo_modb,kazoo_numbers,kazoo_stdlib,
                              kazoo_token_buckets,kernel,lager,stdlib]},
               {description,"doodle - sms store and forward"},
               {env,[{is_kazoo_app,true}]},

diff --git a/applications/doodle/src/doodle.hrl b/applications/doodle/src/doodle.hrl
@@ -3,7 +3,7 @@
 -include_lib("kazoo_stdlib/include/kz_log.hrl").
 -include_lib("kazoo_stdlib/include/kz_databases.hrl").
 -include_lib("kazoo_amqp/include/kz_api_literals.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 -include_lib("kazoo_call/include/kapps_call_command_types.hrl").
 
 -define(APP_NAME, <<"doodle">>).

diff --git a/applications/ecallmgr/src/ecallmgr.app.src b/applications/ecallmgr/src/ecallmgr.app.src
@@ -2,7 +2,7 @@
     [{applications,
          [gproc,kazoo,kazoo_amqp,kazoo_apps,kazoo_bindings,kazoo_caches,
           kazoo_config,kazoo_data,kazoo_directory,kazoo_documents,
-          kazoo_endpoint,kazoo_globals,kazoo_ledgers,kazoo_number_manager,
+          kazoo_endpoint,kazoo_globals,kazoo_ledgers,kazoo_numbers,
           kazoo_sip,kazoo_speech,kazoo_stdlib,kazoo_web,kazoo_xml,kernel,
           lager,stdlib,xmerl]},
      {description,"Manage resource requests and interface with FreeSWITCH"},

diff --git a/applications/fax/src/fax.app.src b/applications/fax/src/fax.app.src
@@ -2,7 +2,7 @@
              [{applications,[cowboy,escalus,exml,gen_smtp,kazoo,kazoo_amqp,
                              kazoo_apps,kazoo_caches,kazoo_call,kazoo_data,
                              kazoo_documents,kazoo_fax,kazoo_globals,
-                             kazoo_media,kazoo_modb,kazoo_number_manager,
+                             kazoo_media,kazoo_modb,kazoo_numbers,
                              kazoo_oauth,kazoo_schemas,kazoo_services,
                              kazoo_stdlib,kazoo_web,kernel,lager,ra,stdlib]},
               {description,"Fax - Why is everyone faxinated with fax?"},

diff --git a/applications/hangups/src/hangups.app.src b/applications/hangups/src/hangups.app.src
@@ -1,7 +1,7 @@
 {application,hangups,
              [{applications,[folsom,kazoo,kazoo_amqp,kazoo_apps,
                              kazoo_documents,kazoo_endpoint,
-                             kazoo_number_manager,kazoo_stdlib,kernel,lager,
+                             kazoo_numbers,kazoo_stdlib,kernel,lager,
                              stdlib]},
               {description,"Listen for abnormal hangups and store them in Couch"},
               {env,[{is_kazoo_app,true}]},

diff --git a/applications/hotornot/src/hotornot.app.src b/applications/hotornot/src/hotornot.app.src
@@ -1,7 +1,7 @@
 {application,hotornot,
              [{applications,[kazoo,kazoo_amqp,kazoo_apps,kazoo_call,
                              kazoo_data,kazoo_databases,kazoo_documents,
-                             kazoo_ledgers,kazoo_number_manager,
+                             kazoo_ledgers,kazoo_numbers,
                              kazoo_services,kazoo_stdlib,kernel,lager,stdlib,
                              trie]},
               {description,"HotOrNot - Rate calls based on prefix"},

diff --git a/applications/jonny5/src/jonny5.app.src b/applications/jonny5/src/jonny5.app.src
@@ -2,7 +2,7 @@
              [{applications,[kazoo,kazoo_amqp,kazoo_apps,kazoo_caches,
                              kazoo_call,kazoo_data,kazoo_documents,
                              kazoo_endpoint,kazoo_events,kazoo_globals,
-                             kazoo_ledgers,kazoo_modb,kazoo_number_manager,
+                             kazoo_ledgers,kazoo_modb,kazoo_numbers,
                              kazoo_services,kazoo_stdlib,kernel,lager,stdlib]},
               {description,"Jonny 5 - Short circuit accounts exceeding call volume"},
               {env,[{is_kazoo_app,true}]},

diff --git a/applications/notify/src/notify.app.src b/applications/notify/src/notify.app.src
@@ -1,7 +1,7 @@
 {application,notify,
              [{applications,[gen_smtp,inets,kazoo,kazoo_amqp,kazoo_apps,
                              kazoo_data,kazoo_documents,kazoo_fax,kazoo_modb,
-                             kazoo_number_manager,kazoo_services,kazoo_stdlib,
+                             kazoo_numbers,kazoo_services,kazoo_stdlib,
                              kazoo_templates,kazoo_voicemail,kazoo_web,kernel,
                              lager,stdlib]},
               {description,"Notify - Kazoo"},

diff --git a/applications/reorder/src/reorder.app.src b/applications/reorder/src/reorder.app.src
@@ -1,6 +1,6 @@
 {application,reorder,
              [{applications,[kazoo,kazoo_amqp,kazoo_apps,kazoo_call,
-                             kazoo_endpoint,kazoo_number_manager,kazoo_stdlib,
+                             kazoo_endpoint,kazoo_numbers,kazoo_stdlib,
                              kernel,lager,stdlib]},
               {description,"Reorder - "},
               {env,[{is_kazoo_app,true}]},

diff --git a/applications/stepswitch/src/stepswitch.app.src b/applications/stepswitch/src/stepswitch.app.src
@@ -2,7 +2,7 @@
              [{applications,[kazoo,kazoo_amqp,kazoo_apps,kazoo_caches,
                              kazoo_call,kazoo_data,kazoo_documents,
                              kazoo_endpoint,kazoo_globals,kazoo_ips,
-                             kazoo_number_manager,kazoo_services,kazoo_sip,
+                             kazoo_numbers,kazoo_services,kazoo_sip,
                              kazoo_stdlib,kernel,lager,stdlib]},
               {description,"Routes calls coming or going offnet, like a line finder"},
               {env,[{is_kazoo_app,true}]},

diff --git a/applications/stepswitch/src/stepswitch.hrl b/applications/stepswitch/src/stepswitch.hrl
@@ -3,7 +3,7 @@
 -include_lib("kazoo_stdlib/include/kz_log.hrl").
 -include_lib("kazoo_stdlib/include/kz_databases.hrl").
 -include_lib("kazoo_amqp/include/kz_api_literals.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(LOCAL_RESOURCES_VIEW, <<"resources/crossbar_listing">>).
 

diff --git a/applications/stepswitch/src/stepswitch_bridge.erl b/applications/stepswitch/src/stepswitch_bridge.erl
@@ -29,7 +29,7 @@
 
 -include("stepswitch.hrl").
 -include_lib("kazoo_amqp/include/kapi_offnet_resource.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(SERVER, ?MODULE).
 

diff --git a/applications/tasks/src/knm_number_crawler.erl b/applications/tasks/src/knm_number_crawler.erl
@@ -27,7 +27,7 @@
         ]).
 
 -include("tasks.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(SERVER, ?MODULE).
 

diff --git a/applications/tasks/src/knm_port_request_crawler.erl b/applications/tasks/src/knm_port_request_crawler.erl
@@ -27,7 +27,7 @@
         ]).
 
 -include("tasks.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(CLEANUP_ROUNDTRIP_TIME
        ,kapps_config:get_integer(?CONFIG_CAT, <<"crawler_delay_time_ms">>, ?MILLISECONDS_IN_MINUTE)

diff --git a/applications/tasks/src/modules/kt_numbers.erl b/applications/tasks/src/modules/kt_numbers.erl
@@ -45,7 +45,7 @@
         ,delete/3
         ]).
 
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 -include("tasks.hrl").
 
 -define(MOD_CAT, <<(?CONFIG_CAT)/binary, ".numbers">>).

diff --git a/applications/tasks/src/modules/kt_port_requests.erl b/applications/tasks/src/modules/kt_port_requests.erl
@@ -22,7 +22,7 @@
         ]).
 
 -include("tasks.hrl").
--include_lib("kazoo_number_manager/include/knm_port_request.hrl").
+-include_lib("kazoo_numbers/include/knm_port_request.hrl").
 
 -define(LISTING_BY_STATE, <<"port_requests/listing_by_state">>).
 

diff --git a/applications/tasks/src/tasks.app.src b/applications/tasks/src/tasks.app.src
@@ -2,7 +2,7 @@
              [{applications,[couchbeam,kazoo,kazoo_amqp,kazoo_apps,
                              kazoo_bindings,kazoo_couch,kazoo_csv,kazoo_data,
                              kazoo_documents,kazoo_globals,kazoo_ledgers,
-                             kazoo_modb,kazoo_number_manager,kazoo_services,
+                             kazoo_modb,kazoo_numbers,kazoo_services,
                              kazoo_stdlib,kazoo_tasks,kazoo_voicemail,
                              kazoo_web,kernel,lager,stdlib]},
               {description,"Tasks - Schedule one-offs cluster-wide tasks"},

diff --git a/applications/teletype/src/teletype.app.src b/applications/teletype/src/teletype.app.src
@@ -2,7 +2,7 @@
              [{applications,[cowlib,gen_smtp,kazoo,kazoo_amqp,kazoo_apps,
                              kazoo_bindings,kazoo_caches,kazoo_data,
                              kazoo_documents,kazoo_fax,kazoo_ledgers,
-                             kazoo_modb,kazoo_number_manager,kazoo_services,
+                             kazoo_modb,kazoo_numbers,kazoo_services,
                              kazoo_stdlib,kazoo_templates,kazoo_voicemail,
                              kazoo_web,kernel,lager,poolboy,stdlib]},
               {description,"Teletype - Receive events and send them to interested parties"},

diff --git a/applications/teletype/src/teletype_port_utils.erl b/applications/teletype/src/teletype_port_utils.erl
@@ -15,7 +15,7 @@
         ]).
 
 -include("teletype.hrl").
--include_lib("kazoo_number_manager/include/knm_port_request.hrl").
+-include_lib("kazoo_numbers/include/knm_port_request.hrl").
 
 -spec port_request_data(kz_json:object(), kz_term:ne_binary()) -> kz_json:object().
 port_request_data(DataJObj, TemplateId) ->

diff --git a/applications/trunkstore/src/trunkstore.app.src b/applications/trunkstore/src/trunkstore.app.src
@@ -2,7 +2,7 @@
              [{applications,[kazoo,kazoo_amqp,kazoo_apps,kazoo_caches,
                              kazoo_call,kazoo_data,kazoo_documents,
                              kazoo_endpoint,kazoo_globals,
-                             kazoo_number_manager,kazoo_stdlib,kernel,lager,
+                             kazoo_numbers,kazoo_stdlib,kernel,lager,
                              stdlib]},
               {description,"Trunk Store Backend - Authentication and Routing"},
               {env,[{is_kazoo_app,true}]},

diff --git a/applications/trunkstore/src/ts.hrl b/applications/trunkstore/src/ts.hrl
@@ -2,7 +2,7 @@
 -include_lib("kazoo_stdlib/include/kz_types.hrl").
 -include_lib("kazoo_stdlib/include/kz_log.hrl").
 -include_lib("kazoo_stdlib/include/kz_databases.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(APP_NAME, <<"trunkstore">>).
 -define(APP_VERSION, <<"4.0.0">>).

diff --git a/core/.gitignore b/core/.gitignore
@@ -5,6 +5,6 @@
 /kazoo/src/kz_mime.erl
 /kazoo_auth/c_src/*
 /kazoo_auth/priv/kz_auth_rsa_drv.so
-/kazoo_number_manager/dialcodes.json
-/kazoo_number_manager/src/knm_iso3166a2_itu.erl
+/kazoo_numbers/dialcodes.json
+/kazoo_numbers/src/knm_iso3166a2_itu.erl
 /sup/sup
diff --git a/core/kazoo_amqp/doc/.org/README.org b/core/kazoo_amqp/doc/.org/README.org
@@ -135,7 +135,7 @@ core/kazoo_events/src/kz_hooks_listener.erl
 core/kazoo_globals/src/kz_globals.erl
 core/kazoo_globals/src/kz_nodes.erl
 core/kazoo_media/src/kz_media_map.erl
-core/kazoo_number_manager/src/knm_search.erl
+core/kazoo_numbers/src/knm_search.erl
 #+end_src
 
 *** Long-lived anon queue names
@@ -162,7 +162,7 @@ core/kazoo_events/src/kz_hooks_listener.erl
 core/kazoo_globals/src/kz_globals.erl
 core/kazoo_globals/src/kz_nodes.erl
 core/kazoo_media/src/kz_media_map.erl
-core/kazoo_number_manager/src/knm_search.erl
+core/kazoo_numbers/src/knm_search.erl
 *** Ephemeral processes
 applications/callflow/src/cf_exe.erl
 applications/callflow/src/cf_singular_call_hooks_listener.erl

diff --git a/core/kazoo_apps/src/kapps_maintenance.erl b/core/kazoo_apps/src/kapps_maintenance.erl
@@ -1215,7 +1215,7 @@ import_account(AccountId, ParentId, {'ok', AccountJObj}, {'ok', ParentJObj}) ->
             io:format("account saved, updating services and import account's numbers to number dbs~n"),
             update_or_add_to_accounts_db(AccountId, SavedJObj),
             _ = remove_and_reconcile_services(AccountId),
-            _ = kazoo_number_manager_maintenance:copy_single_account_to_number_dbs(AccountId),
+            _ = kazoo_numbers_maintenance:copy_single_account_to_number_dbs(AccountId),
             'ok';
         {'error', _Reason} ->
             io:format("failed to update account '~s' definition in accountdb: ~p~n", [AccountId, _Reason])

diff --git a/core/kazoo_call/src/kazoo_call.app.src b/core/kazoo_call/src/kazoo_call.app.src
@@ -2,7 +2,7 @@
              [{applications,[crypto,kazoo,kazoo_amqp,kazoo_apps,kazoo_caches,
                              kazoo_data,kazoo_documents,kazoo_endpoint,
                              kazoo_ledgers,kazoo_media,kazoo_modb,
-                             kazoo_number_manager,kazoo_speech,kazoo_stdlib,
+                             kazoo_numbers,kazoo_speech,kazoo_stdlib,
                              kazoo_web,lager,stdlib]},
               {description,"Representing calls in Kazoo since 2011"},
               {id,[]},

diff --git a/core/kazoo_cnam/src/cnam.hrl b/core/kazoo_cnam/src/cnam.hrl
@@ -4,7 +4,7 @@
 -include_lib("kazoo_stdlib/include/kz_log.hrl").
 -include_lib("kazoo_stdlib/include/kz_databases.hrl").
 -include_lib("kazoo_amqp/include/kz_api_literals.hrl").
--include_lib("kazoo_number_manager/include/knm_phone_number.hrl").
+-include_lib("kazoo_numbers/include/knm_phone_number.hrl").
 
 -define(APP, 'cnam').
 -define(APP_NAME, <<"cnam">>).