diff --git a/src/smt/CMakeLists.txt b/src/smt/CMakeLists.txt
index 9d2a2b40683..e6ee970460f 100644
--- a/src/smt/CMakeLists.txt
+++ b/src/smt/CMakeLists.txt
@@ -70,9 +70,9 @@ z3_add_component(smt
     theory_str.cpp
     theory_str_mc.cpp
     theory_str_regex.cpp
+    theory_user_propagator.cpp
     theory_utvpi.cpp
     theory_wmaxsat.cpp
-    user_propagator.cpp
     uses_theory.cpp
     watch_list.cpp
   COMPONENT_DEPENDENCIES
diff --git a/src/smt/smt_context.h b/src/smt/smt_context.h
index 20ee4762969..700c2f21109 100644
--- a/src/smt/smt_context.h
+++ b/src/smt/smt_context.h
@@ -46,7 +46,7 @@ Revision History:
 #include "util/statistics.h"
 #include "smt/fingerprints.h"
 #include "smt/proto_model/proto_model.h"
-#include "smt/user_propagator.h"
+#include "smt/theory_user_propagator.h"
 #include "model/model.h"
 #include "solver/progress_callback.h"
 #include "solver/assertions/asserted_formulas.h"
diff --git a/src/smt/user_propagator.cpp b/src/smt/theory_user_propagator.cpp
similarity index 98%
rename from src/smt/user_propagator.cpp
rename to src/smt/theory_user_propagator.cpp
index 799ae23e2ab..c4747a084fb 100644
--- a/src/smt/user_propagator.cpp
+++ b/src/smt/theory_user_propagator.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2020 Microsoft Corporation
 
 Module Name:
 
-    user_propagator.cpp
+    theory_user_propagator.cpp
 
 Abstract:
 
@@ -17,7 +17,7 @@ Module Name:
 
 
 #include "ast/ast_pp.h"
-#include "smt/user_propagator.h"
+#include "smt/theory_user_propagator.h"
 #include "smt/smt_context.h"
 
 using namespace smt;
diff --git a/src/smt/user_propagator.h b/src/smt/theory_user_propagator.h
similarity index 100%
rename from src/smt/user_propagator.h
rename to src/smt/theory_user_propagator.h