diff --git a/Debug/cli/cli.c b/Debug/cli/cli.c
index 0e81893..da657cc 100644
--- a/Debug/cli/cli.c
+++ b/Debug/cli/cli.c
@@ -31,7 +31,7 @@
 
 // ----- Functions -----
 
-void initCLI()
+void init_cli()
 {
 }
 
diff --git a/Debug/cli/cli.h b/Debug/cli/cli.h
index 50f7a3b..d5f4e5b 100644
--- a/Debug/cli/cli.h
+++ b/Debug/cli/cli.h
@@ -41,7 +41,7 @@
 
 // ----- Functions and Corresponding Function Aliases -----
 
-void initCLI();
+void init_cli();
 
 
 
diff --git a/Output/pjrcUSB/arm/usb_desc.h b/Output/pjrcUSB/arm/usb_desc.h
index f4e8dfc..9f4511e 100644
--- a/Output/pjrcUSB/arm/usb_desc.h
+++ b/Output/pjrcUSB/arm/usb_desc.h
@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "usb_com.h"
+#include "output_com.h"
 
 #define ENDPOINT_UNUSED			0x00
 #define ENDPOINT_TRANSIMIT_ONLY		0x15
diff --git a/Output/pjrcUSB/arm/usb_keyboard.h b/Output/pjrcUSB/arm/usb_keyboard.h
index 49aa84d..792076a 100644
--- a/Output/pjrcUSB/arm/usb_keyboard.h
+++ b/Output/pjrcUSB/arm/usb_keyboard.h
@@ -2,7 +2,7 @@
 #define USBkeyboard_h_
 
 #include <inttypes.h>
-#include "usb_com.h"
+#include "output_com.h"
 
 uint8_t usb_keyboard_send(void);
 
diff --git a/Output/pjrcUSB/avr/usb_keyboard_debug.h b/Output/pjrcUSB/avr/usb_keyboard_debug.h
index 987e4fd..121215d 100644
--- a/Output/pjrcUSB/avr/usb_keyboard_debug.h
+++ b/Output/pjrcUSB/avr/usb_keyboard_debug.h
@@ -2,7 +2,7 @@
 #define usb_serial_h__
 
 #include <stdint.h>
-#include "usb_com.h"
+#include "output_com.h"
 
 void usb_init(void);			// initialize everything
 uint8_t usb_configured(void);		// is the USB port configured
diff --git a/Output/pjrcUSB/output_com.c b/Output/pjrcUSB/output_com.c
index 96fb0f7..06ca58c 100644
--- a/Output/pjrcUSB/output_com.c
+++ b/Output/pjrcUSB/output_com.c
@@ -73,7 +73,7 @@ volatile uint8_t USBKeys_LEDs = 0;
 // ----- Functions -----
 
 // USB Module Setup
-inline void usb_setup(void)
+inline void output_setup(void)
 {
 	// Initialize the USB, and then wait for the host to set configuration.
 	// If the Teensy is powered without a PC connected to the USB port,
diff --git a/Output/pjrcUSB/output_com.h b/Output/pjrcUSB/output_com.h
index 07f81f5..bc31b2d 100644
--- a/Output/pjrcUSB/output_com.h
+++ b/Output/pjrcUSB/output_com.h
@@ -58,8 +58,7 @@ extern                       uint8_t USBKeys_Idle_Count;
 
 // ----- Functions -----
 
-void usb_setup(void);
-void usb_send(void);
+void output_setup(void);
 
 #endif
 
diff --git a/main.c b/main.c
index 90ca20e..dd8b8e0 100644
--- a/main.c
+++ b/main.c
@@ -27,7 +27,7 @@
 // Project Includes
 #include <macro.h>
 #include <scan_loop.h>
-#include <usb_com.h>
+#include <output_com.h>
 
 #include <led.h>
 #include <print.h>
@@ -136,8 +136,11 @@ int main(void)
 	pinSetup();
 	init_errorLED();
 
-	// Setup USB Module
-	usb_setup();
+	// Setup Output Module
+	output_setup();
+
+	// Enable CLI
+	init_cli();
 
 	// Setup ISR Timer for flagging a kepress send to USB
 	usbTimerSetup();