diff --git a/doc/api/control-panel.rst b/doc/api/control-panel.rst
index f40f2cd8..73987bcc 100644
--- a/doc/api/control-panel.rst
+++ b/doc/api/control-panel.rst
@@ -11,7 +11,7 @@ Device lifecycle management
 .. doxygenstruct:: osdp_pd_info_t
    :members:
 
-.. doxygenfunction:: osdp_cp_setup2
+.. doxygenfunction:: osdp_cp_setup
 
 .. doxygenfunction:: osdp_cp_refresh
 
diff --git a/doc/api/miscellaneous.rst b/doc/api/miscellaneous.rst
index 2e83b090..a0f3e48e 100644
--- a/doc/api/miscellaneous.rst
+++ b/doc/api/miscellaneous.rst
@@ -4,7 +4,7 @@ Miscellaneous
 Debugging and Diagnostics
 -------------------------
 
-.. doxygenfunction:: osdp_logger_init3
+.. doxygenfunction:: osdp_logger_init
 
 .. doxygenfunction:: osdp_get_version
 
diff --git a/doc/libosdp/debugging.rst b/doc/libosdp/debugging.rst
index e0d99e44..f91871d6 100644
--- a/doc/libosdp/debugging.rst
+++ b/doc/libosdp/debugging.rst
@@ -27,12 +27,12 @@ Log Level
 LibOSDP supports different logging levels with ``LOG_DEBUG`` being the most
 verbose mode. When asking for help, please set the log level to ``LOG_DEBUG``.
 
-This can be done by calling osdp_logger_init3() BEFORE calling osdp_cp/pd_setup()
+This can be done by calling osdp_logger_init() BEFORE calling osdp_cp/pd_setup()
 as,
 
 .. code:: c
 
-    osdp_logger_init3("osdp::cp", LOG_DEBUG, uart_puts);
+    osdp_logger_init("osdp::cp", LOG_DEBUG, uart_puts);
 
 Packet Trace Builds
 -------------------
diff --git a/osdpctl/archive/cmd_start.c b/osdpctl/archive/cmd_start.c
index 1d4594e9..5b785685 100644
--- a/osdpctl/archive/cmd_start.c
+++ b/osdpctl/archive/cmd_start.c
@@ -317,10 +317,10 @@ int cmd_handler_start(int argc, char *argv[], void *data)
 		info->scbk = NULL;
 	}
 
-	osdp_logger_init3("osdp::cp", c->log_level, NULL);
+	osdp_logger_init("osdp::cp", c->log_level, NULL);
 
 	if (c->mode == CONFIG_MODE_CP) {
-		c->cp_ctx = osdp_cp_setup2(c->num_pd, info_arr);
+		c->cp_ctx = osdp_cp_setup(c->num_pd, info_arr);
 		if (c->cp_ctx == NULL) {
 			printf("Failed to setup CP context\n");
 			return -1;
diff --git a/tests/unit-tests/test-cp-fsm.c b/tests/unit-tests/test-cp-fsm.c
index 61cc7c3d..1a19b550 100644
--- a/tests/unit-tests/test-cp-fsm.c
+++ b/tests/unit-tests/test-cp-fsm.c
@@ -94,8 +94,8 @@ int test_cp_fsm_setup(struct test *t)
 		.channel.flush = NULL,
 		.scbk = NULL,
 	};
-	osdp_logger_init3("osdp::cp", t->loglevel, NULL);
-	struct osdp *ctx = (struct osdp *)osdp_cp_setup2(1, &info);
+	osdp_logger_init("osdp::cp", t->loglevel, NULL);
+	struct osdp *ctx = (struct osdp *)osdp_cp_setup(1, &info);
 	if (ctx == NULL) {
 		printf("   init failed!\n");
 		return -1;
diff --git a/tests/unit-tests/test-cp-phy-fsm.c b/tests/unit-tests/test-cp-phy-fsm.c
index a8a08a46..a55911b4 100644
--- a/tests/unit-tests/test-cp-phy-fsm.c
+++ b/tests/unit-tests/test-cp-phy-fsm.c
@@ -97,8 +97,8 @@ int test_cp_phy_fsm_setup(struct test *t)
 		.channel.flush = NULL,
 		.scbk = NULL,
 	};
-	osdp_logger_init3("osdp::cp", t->loglevel, NULL);
-	struct osdp *ctx = (struct osdp *)osdp_cp_setup2(1, &info);
+	osdp_logger_init("osdp::cp", t->loglevel, NULL);
+	struct osdp *ctx = (struct osdp *)osdp_cp_setup(1, &info);
 	if (ctx == NULL) {
 		printf("   init failed!\n");
 		return -1;
diff --git a/tests/unit-tests/test-cp-phy.c b/tests/unit-tests/test-cp-phy.c
index 450d3a53..5885110e 100644
--- a/tests/unit-tests/test-cp-phy.c
+++ b/tests/unit-tests/test-cp-phy.c
@@ -147,8 +147,8 @@ int test_cp_phy_setup(struct test *t)
 		.channel.flush = NULL,
 		.scbk = NULL,
 	};
-	osdp_logger_init3("osdp::cp", t->loglevel, NULL);
-	struct osdp *ctx = (struct osdp *)osdp_cp_setup2(1, &info);
+	osdp_logger_init("osdp::cp", t->loglevel, NULL);
+	struct osdp *ctx = (struct osdp *)osdp_cp_setup(1, &info);
 	if (ctx == NULL) {
 		printf(SUB_1 "init failed!\n");
 		return -1;
diff --git a/tests/unit-tests/test.c b/tests/unit-tests/test.c
index a96b3128..b40f772e 100644
--- a/tests/unit-tests/test.c
+++ b/tests/unit-tests/test.c
@@ -195,7 +195,7 @@ int test_mock_pd_receive(void *data, uint8_t *buf, int len)
 
 int test_setup_devices(struct test *t, osdp_t **cp, osdp_t **pd)
 {
-	osdp_logger_init3("osdp", t->loglevel, NULL);
+	osdp_logger_init("osdp", t->loglevel, NULL);
 
 	uint8_t scbk[16] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -213,7 +213,7 @@ int test_setup_devices(struct test *t, osdp_t **cp, osdp_t **pd)
 		.scbk = scbk,
 	};
 
-	*cp = osdp_cp_setup2(1, &info_cp);
+	*cp = osdp_cp_setup(1, &info_cp);
 	if (*cp == NULL) {
 		printf("   cp init failed!\n");
 		return -1;