diff --git a/src/MIPLearn.jl b/src/MIPLearn.jl
index 04adc8e..dcd5c18 100644
--- a/src/MIPLearn.jl
+++ b/src/MIPLearn.jl
@@ -22,11 +22,11 @@ global Hdf5Sample = PyNULL()
 
 include("utils/log.jl")
 include("utils/exceptions.jl")
-include("instance/abstract.jl")
-include("instance/jump.jl")
-include("instance/file.jl")
-include("solvers/jump.jl")
-include("solvers/learning.jl")
+include("instance/abstract_instance.jl")
+include("instance/jump_instance.jl")
+include("instance/file_instance.jl")
+include("solvers/jump_solver.jl")
+include("solvers/learning_solver.jl")
 include("solvers/macros.jl")
 include("utils/benchmark.jl")
 
diff --git a/src/instance/abstract.jl b/src/instance/abstract_instance.jl
similarity index 100%
rename from src/instance/abstract.jl
rename to src/instance/abstract_instance.jl
diff --git a/src/instance/file.jl b/src/instance/file_instance.jl
similarity index 100%
rename from src/instance/file.jl
rename to src/instance/file_instance.jl
diff --git a/src/instance/jump.jl b/src/instance/jump_instance.jl
similarity index 100%
rename from src/instance/jump.jl
rename to src/instance/jump_instance.jl
diff --git a/src/solvers/jump.jl b/src/solvers/jump_solver.jl
similarity index 100%
rename from src/solvers/jump.jl
rename to src/solvers/jump_solver.jl
diff --git a/src/solvers/learning.jl b/src/solvers/learning_solver.jl
similarity index 100%
rename from src/solvers/learning.jl
rename to src/solvers/learning_solver.jl
diff --git a/test/instance/file_test.jl b/test/instance/file_instance_test.jl
similarity index 100%
rename from test/instance/file_test.jl
rename to test/instance/file_instance_test.jl
diff --git a/test/instance/jump_test.jl b/test/instance/jump_instance_test.jl
similarity index 100%
rename from test/instance/jump_test.jl
rename to test/instance/jump_instance_test.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index c55a8c6..a5d90f2 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -9,9 +9,9 @@ MIPLearn.setup_logger()
 
 @testset "MIPLearn" begin
     include("fixtures/knapsack.jl")
-    include("instance/file_test.jl")
-    include("instance/jump_test.jl")
-    include("solvers/jump_test.jl")
-    include("solvers/learning_test.jl")
+    include("instance/file_instance_test.jl")
+    include("instance/jump_instance_test.jl")
+    include("solvers/jump_solver_test.jl")
+    include("solvers/learning_solver_test.jl")
     include("utils/benchmark_test.jl")
 end
diff --git a/test/solvers/jump_test.jl b/test/solvers/jump_solver_test.jl
similarity index 100%
rename from test/solvers/jump_test.jl
rename to test/solvers/jump_solver_test.jl
diff --git a/test/solvers/learning_test.jl b/test/solvers/learning_solver_test.jl
similarity index 100%
rename from test/solvers/learning_test.jl
rename to test/solvers/learning_solver_test.jl