diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt
index f823f031..1e98b81e 100644
--- a/userspace/falco/CMakeLists.txt
+++ b/userspace/falco/CMakeLists.txt
@@ -47,10 +47,10 @@ add_executable(
   configuration.cpp
   logger.cpp
   falco_outputs.cpp
-  falco_outputs_file.cpp
-  falco_outputs_program.cpp
-  falco_outputs_stdout.cpp
-  falco_outputs_syslog.cpp
+  outputs_file.cpp
+  outputs_program.cpp
+  outputs_stdout.cpp
+  outputs_syslog.cpp
   event_drops.cpp
   statsfilewriter.cpp
   falco.cpp
@@ -61,12 +61,12 @@ else()
     configuration.cpp
     logger.cpp
     falco_outputs.cpp
-    falco_outputs_file.cpp
-    falco_outputs_grpc.cpp
-    falco_outputs_http.cpp
-    falco_outputs_program.cpp
-    falco_outputs_stdout.cpp
-    falco_outputs_syslog.cpp
+    outputs_file.cpp
+    outputs_grpc.cpp
+    outputs_http.cpp
+    outputs_program.cpp
+    outputs_stdout.cpp
+    outputs_syslog.cpp
     event_drops.cpp
     statsfilewriter.cpp
     falco.cpp
diff --git a/userspace/falco/falco_outputs.cpp b/userspace/falco/falco_outputs.cpp
index a797fd61..80754584 100644
--- a/userspace/falco/falco_outputs.cpp
+++ b/userspace/falco/falco_outputs.cpp
@@ -25,13 +25,13 @@ limitations under the License.
 #include "formats.h"
 #include "logger.h"
 
-#include "falco_outputs_file.h"
-#include "falco_outputs_program.h"
-#include "falco_outputs_stdout.h"
-#include "falco_outputs_syslog.h"
+#include "outputs_file.h"
+#include "outputs_program.h"
+#include "outputs_stdout.h"
+#include "outputs_syslog.h"
 #ifndef MINIMAL_BUILD
-#include "falco_outputs_http.h"
-#include "falco_outputs_grpc.h"
+#include "outputs_http.h"
+#include "outputs_grpc.h"
 #endif
 
 #include "banned.h" // This raises a compilation error when certain functions are used
diff --git a/userspace/falco/falco_outputs.h b/userspace/falco/falco_outputs.h
index 3ce53657..0de3288b 100644
--- a/userspace/falco/falco_outputs.h
+++ b/userspace/falco/falco_outputs.h
@@ -24,7 +24,7 @@ limitations under the License.
 #include "falco_common.h"
 #include "token_bucket.h"
 #include "falco_engine.h"
-#include "falco_output.h"
+#include "outputs.h"
 
 //
 // This class acts as the primary interface between a program and the
diff --git a/userspace/falco/grpc_server_impl.cpp b/userspace/falco/grpc_server_impl.cpp
index bda1656a..ba05c152 100644
--- a/userspace/falco/grpc_server_impl.cpp
+++ b/userspace/falco/grpc_server_impl.cpp
@@ -16,7 +16,7 @@ limitations under the License.
 
 #include "config_falco.h"
 #include "grpc_server_impl.h"
-#include "falco_outputs_queue.h"
+#include "outputs_queue.h"
 #include "logger.h"
 #include "banned.h" // This raises a compilation error when certain functions are used
 
diff --git a/userspace/falco/falco_output.h b/userspace/falco/outputs.h
similarity index 100%
rename from userspace/falco/falco_output.h
rename to userspace/falco/outputs.h
diff --git a/userspace/falco/falco_outputs_file.cpp b/userspace/falco/outputs_file.cpp
similarity index 97%
rename from userspace/falco/falco_outputs_file.cpp
rename to userspace/falco/outputs_file.cpp
index 5efd9b3a..f6f836fb 100644
--- a/userspace/falco/falco_outputs_file.cpp
+++ b/userspace/falco/outputs_file.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "falco_outputs_file.h"
+#include "outputs_file.h"
 #include <iostream>
 #include <fstream>
 #include "banned.h" // This raises a compilation error when certain functions are used
diff --git a/userspace/falco/falco_outputs_file.h b/userspace/falco/outputs_file.h
similarity index 97%
rename from userspace/falco/falco_outputs_file.h
rename to userspace/falco/outputs_file.h
index 4be5c29a..3f910226 100644
--- a/userspace/falco/falco_outputs_file.h
+++ b/userspace/falco/outputs_file.h
@@ -16,7 +16,7 @@ limitations under the License.
 
 #pragma once
 
-#include "falco_output.h"
+#include "outputs.h"
 #include <iostream>
 #include <fstream>
 
diff --git a/userspace/falco/falco_outputs_grpc.cpp b/userspace/falco/outputs_grpc.cpp
similarity index 97%
rename from userspace/falco/falco_outputs_grpc.cpp
rename to userspace/falco/outputs_grpc.cpp
index 4187e59b..c1076419 100644
--- a/userspace/falco/falco_outputs_grpc.cpp
+++ b/userspace/falco/outputs_grpc.cpp
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 #include <google/protobuf/util/time_util.h>
-#include "falco_outputs_grpc.h"
-#include "falco_outputs_queue.h"
+#include "outputs_grpc.h"
+#include "outputs_queue.h"
 #include "falco_common.h"
 #include "formats.h"
 #include "banned.h" // This raises a compilation error when certain functions are used
diff --git a/userspace/falco/falco_outputs_grpc.h b/userspace/falco/outputs_grpc.h
similarity index 97%
rename from userspace/falco/falco_outputs_grpc.h
rename to userspace/falco/outputs_grpc.h
index f865cfe3..e61002be 100644
--- a/userspace/falco/falco_outputs_grpc.h
+++ b/userspace/falco/outputs_grpc.h
@@ -16,7 +16,7 @@ limitations under the License.
 
 #pragma once
 
-#include "falco_output.h"
+#include "outputs.h"
 
 namespace falco
 {
diff --git a/userspace/falco/falco_outputs_http.cpp b/userspace/falco/outputs_http.cpp
similarity index 98%
rename from userspace/falco/falco_outputs_http.cpp
rename to userspace/falco/outputs_http.cpp
index c32a113c..737bdd4e 100644
--- a/userspace/falco/falco_outputs_http.cpp
+++ b/userspace/falco/outputs_http.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "falco_outputs_http.h"
+#include "outputs_http.h"
 #include "logger.h"
 #include "banned.h" // This raises a compilation error when certain functions are used
 
diff --git a/userspace/falco/falco_outputs_http.h b/userspace/falco/outputs_http.h
similarity index 97%
rename from userspace/falco/falco_outputs_http.h
rename to userspace/falco/outputs_http.h
index 39d01511..1f4134a3 100644
--- a/userspace/falco/falco_outputs_http.h
+++ b/userspace/falco/outputs_http.h
@@ -16,7 +16,7 @@ limitations under the License.
 
 #pragma once
 
-#include "falco_output.h"
+#include "outputs.h"
 
 namespace falco
 {
diff --git a/userspace/falco/falco_outputs_program.cpp b/userspace/falco/outputs_program.cpp
similarity index 97%
rename from userspace/falco/falco_outputs_program.cpp
rename to userspace/falco/outputs_program.cpp
index 838d5d60..4607cb96 100644
--- a/userspace/falco/falco_outputs_program.cpp
+++ b/userspace/falco/outputs_program.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "falco_outputs_program.h"
+#include "outputs_program.h"
 #include <stdio.h>
 #include "banned.h" // This raises a compilation error when certain functions are used
 
diff --git a/userspace/falco/falco_outputs_program.h b/userspace/falco/outputs_program.h
similarity index 97%
rename from userspace/falco/falco_outputs_program.h
rename to userspace/falco/outputs_program.h
index 402b1e0d..42584c5f 100644
--- a/userspace/falco/falco_outputs_program.h
+++ b/userspace/falco/outputs_program.h
@@ -16,7 +16,7 @@ limitations under the License.
 
 #pragma once
 
-#include "falco_output.h"
+#include "outputs.h"
 
 namespace falco
 {
diff --git a/userspace/falco/falco_outputs_queue.h b/userspace/falco/outputs_queue.h
similarity index 100%
rename from userspace/falco/falco_outputs_queue.h
rename to userspace/falco/outputs_queue.h
diff --git a/userspace/falco/falco_outputs_stdout.cpp b/userspace/falco/outputs_stdout.cpp
similarity index 97%
rename from userspace/falco/falco_outputs_stdout.cpp
rename to userspace/falco/outputs_stdout.cpp
index 33872826..92d6998d 100644
--- a/userspace/falco/falco_outputs_stdout.cpp
+++ b/userspace/falco/outputs_stdout.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "falco_outputs_stdout.h"
+#include "outputs_stdout.h"
 #include <iostream>
 #include "banned.h" // This raises a compilation error when certain functions are used
 
diff --git a/userspace/falco/falco_outputs_stdout.h b/userspace/falco/outputs_stdout.h
similarity index 97%
rename from userspace/falco/falco_outputs_stdout.h
rename to userspace/falco/outputs_stdout.h
index 80909a37..b45c2668 100644
--- a/userspace/falco/falco_outputs_stdout.h
+++ b/userspace/falco/outputs_stdout.h
@@ -16,7 +16,7 @@ limitations under the License.
 
 #pragma once
 
-#include "falco_output.h"
+#include "outputs.h"
 
 namespace falco
 {
diff --git a/userspace/falco/falco_outputs_syslog.cpp b/userspace/falco/outputs_syslog.cpp
similarity index 96%
rename from userspace/falco/falco_outputs_syslog.cpp
rename to userspace/falco/outputs_syslog.cpp
index c2b15840..7deed532 100644
--- a/userspace/falco/falco_outputs_syslog.cpp
+++ b/userspace/falco/outputs_syslog.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "falco_outputs_syslog.h"
+#include "outputs_syslog.h"
 #include <syslog.h>
 #include "banned.h" // This raises a compilation error when certain functions are used
 
diff --git a/userspace/falco/falco_outputs_syslog.h b/userspace/falco/outputs_syslog.h
similarity index 97%
rename from userspace/falco/falco_outputs_syslog.h
rename to userspace/falco/outputs_syslog.h
index d398a955..0fb0115d 100644
--- a/userspace/falco/falco_outputs_syslog.h
+++ b/userspace/falco/outputs_syslog.h
@@ -16,7 +16,7 @@ limitations under the License.
 
 #pragma once
 
-#include "falco_output.h"
+#include "outputs.h"
 
 namespace falco
 {