diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
index 23e19cd04f..dd230709ab 100755
--- a/makefiles/Makefile.cpp.mk
+++ b/makefiles/Makefile.cpp.mk
@@ -417,23 +417,23 @@ rcc_%: $(BIN_DIR)/%$E FORCE
 
 .PHONY: test_cc_sat_samples # Build and Run all C++ Sat Samples (located in ortools/sat/samples)
 test_cc_sat_samples: \
- rcc_binpacking_problem \
- rcc_bool_or_sample \
- rcc_channeling_sample \
- rcc_code_sample \
- rcc_cp_is_fun \
- rcc_interval_sample \
- rcc_literal_sample \
- rcc_no_overlap_sample \
- rcc_optional_interval_sample \
- rcc_rabbits_and_pheasants \
- rcc_ranking_sample \
- rcc_reified_sample \
- rcc_simple_solve \
- rcc_solve_all_solutions \
- rcc_solve_with_intermediate_solutions \
- rcc_solve_with_time_limit \
- rcc_stop_after_n_solutions
+ rcc_binpacking_problem_sat \
+ rcc_bool_or_sample_sat \
+ rcc_channeling_sample_sat \
+ rcc_cp_is_fun_sat \
+ rcc_interval_sample_sat \
+ rcc_literal_sample_sat \
+ rcc_no_overlap_sample_sat \
+ rcc_optional_interval_sample_sat \
+ rcc_rabbits_and_pheasants_sat \
+ rcc_ranking_sample_sat \
+ rcc_reified_sample_sat \
+ rcc_search_for_all_solutions_sample_sat \
+ rcc_simple_sat_program \
+ rcc_simple_solve_sample_sat \
+ rcc_solve_and_print_intermediate_solutions_sample_sat \
+ rcc_solve_with_time_limit_sample_sat \
+ rcc_stop_after_n_solutions_sample_sat
 
 .PHONY: test_cc_linear_solver_samples # Build and Run all C++ LP Samples (located in ortools/linear_solver/samples)
 test_cc_linear_solver_samples: \
diff --git a/makefiles/Makefile.dotnet.mk b/makefiles/Makefile.dotnet.mk
index ad9f34e543..1ba6a2c906 100644
--- a/makefiles/Makefile.dotnet.mk
+++ b/makefiles/Makefile.dotnet.mk
@@ -479,23 +479,23 @@ rdotnet_%.cs: \
 
 .PHONY: test_dotnet_sat_samples # Build and Run all .Net SAT Samples (located in ortools/sat/samples)
 test_dotnet_sat_samples: \
- rdotnet_BinPackingProblem.cs \
- rdotnet_BoolOrSample.cs \
- rdotnet_ChannelingSample.cs \
- rdotnet_CodeSample.cs \
- rdotnet_CpIsFun.cs \
- rdotnet_IntervalSample.cs \
- rdotnet_LiteralSample.cs \
- rdotnet_NoOverlapSample.cs \
- rdotnet_OptionalIntervalSample.cs \
- rdotnet_RabbitsAndPheasants.cs \
- rdotnet_RankingSample.cs \
- rdotnet_ReifiedSample.cs \
- rdotnet_SimpleSolve.cs \
- rdotnet_SolveAllSolutions.cs \
- rdotnet_SolveWithIntermediateSolutions.cs \
- rdotnet_SolveWithTimeLimit.cs \
- rdotnet_StopAfterNSolutions.cs
+ rdotnet_BinPackingProblemSat.cs \
+ rdotnet_BoolOrSampleSat.cs \
+ rdotnet_ChannelingSampleSat.cs \
+ rdotnet_CpIsFunSat.cs \
+ rdotnet_IntervalSampleSat.cs \
+ rdotnet_LiteralSampleSat.cs \
+ rdotnet_NoOverlapSampleSat.cs \
+ rdotnet_OptionalIntervalSampleSat.cs \
+ rdotnet_RabbitsAndPheasantsSat.cs \
+ rdotnet_RankingSampleSat.cs \
+ rdotnet_ReifiedSampleSat.cs \
+ rdotnet_SearchForAllSolutionsSampleSat.cs \
+ rdotnet_SimpleSatProgram.cs \
+ rdotnet_SimpleSolveSampleSat.cs \
+ rdotnet_SolveAndPrintIntermediateSolutionsSampleSat.cs \
+ rdotnet_SolveWithTimeLimitSampleSat.cs \
+
 
 .PHONY: test_dotnet_linear_solver_samples # Build and Run all .Net LP Samples (located in ortools/linear_solver/samples)
 test_dotnet_linear_solver_samples: \
diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk
index f6fdabfde0..e16143097c 100755
--- a/makefiles/Makefile.java.mk
+++ b/makefiles/Makefile.java.mk
@@ -335,23 +335,23 @@ rjava_%: $(LIB_DIR)/%$J FORCE
 
 .PHONY: test_java_sat_samples # Build and Run all Java SAT Samples (located in ortools/sat/samples)
 test_java_sat_samples: \
- rjava_BinPackingProblem \
- rjava_BoolOrSample \
- rjava_ChannelingSample \
- rjava_CodeSample \
- rjava_CpIsFun \
- rjava_IntervalSample \
- rjava_LiteralSample \
- rjava_NoOverlapSample \
- rjava_OptionalIntervalSample \
- rjava_RabbitsAndPheasants \
- rjava_RankingSample \
- rjava_ReifiedSample \
- rjava_SimpleSolve \
- rjava_SolveAllSolutions \
- rjava_SolveWithIntermediateSolutions \
- rjava_SolveWithTimeLimit \
- rjava_StopAfterNSolutions
+ rjava_BinPackingProblemSat \
+ rjava_BoolOrSampleSat \
+ rjava_ChannelingSampleSat \
+ rjava_CpIsFunSat \
+ rjava_IntervalSampleSat \
+ rjava_LiteralSampleSat \
+ rjava_NoOverlapSampleSat \
+ rjava_OptionalIntervalSampleSat \
+ rjava_RabbitsAndPheasantsSat \
+ rjava_RankingSampleSat \
+ rjava_ReifiedSampleSat \
+ rjava_SearchForAllSolutionsSampleSat \
+ rjava_SimpleSatProgram \
+ rjava_SimpleSolveSampleSat \
+ rjava_SolveAndPrintIntermediateSolutionsSampleSat \
+ rjava_SolveWithTimeLimitSampleSat \
+ rjava_StopAfterNSolutionsSampleSat
 
 .PHONY: test_java_linear_solver_samples # Build and Run all Java LP Samples (located in ortools/linear_solver/samples)
 test_java_linear_solver_samples: \
diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk
index 7c29185317..fc72019192 100755
--- a/makefiles/Makefile.python.mk
+++ b/makefiles/Makefile.python.mk
@@ -487,24 +487,24 @@ rpy_%: ortools/linear_solver/samples/%.py $(PYTHON_OR_TOOLS_LIBS) FORCE
 
 .PHONY: test_python_sat_samples # Run all Python Sat Samples (located in ortools/sat/samples)
 test_python_sat_samples: \
- rpy_binpacking_problem \
- rpy_bool_or_sample \
- rpy_channeling_sample \
- rpy_code_sample \
- rpy_cp_is_fun \
- rpy_interval_sample \
- rpy_literal_sample \
- rpy_minimal_jobshop \
- rpy_no_overlap_sample \
- rpy_optional_interval_sample \
- rpy_rabbits_and_pheasants \
- rpy_ranking_sample \
- rpy_reified_sample \
- rpy_simple_solve \
- rpy_solve_all_solutions \
- rpy_solve_with_intermediate_solutions \
- rpy_solve_with_time_limit \
- rpy_stop_after_n_solutions
+ rpy_binpacking_problem_sat \
+ rpy_bool_or_sample_sat \
+ rpy_channeling_sample_sat \
+ rpy_cp_is_fun_sat \
+ rpy_interval_sample_sat \
+ rpy_literal_sample_sat \
+ rpy_minimal_jobshop_sat \
+ rpy_no_overlap_sample_sat \
+ rpy_optional_interval_sample_sat \
+ rpy_rabbits_and_pheasants_sat \
+ rpy_ranking_sample_sat \
+ rpy_reified_sample_sat \
+ rpy_simple_sat_program \
+ rpy_simple_solve_sample_sat \
+ rpy_search_for_all_solutions_sample_sat \
+ rpy_solve_and_print_intermediate_solutions_sample_sat \
+ rpy_solve_with_time_limit_sample_sat \
+ rpy_stop_after_n_solutions_sample_sat
 
 .PHONY: test_python_linear_solver_samples # Run all Python LP Samples (located in ortools/linear_solver/samples)
 test_python_linear_solver_samples: \
diff --git a/ortools/sat/samples/BinPackingProblem.cs b/ortools/sat/samples/BinPackingProblemSat.cs
similarity index 100%
rename from ortools/sat/samples/BinPackingProblem.cs
rename to ortools/sat/samples/BinPackingProblemSat.cs
diff --git a/ortools/sat/samples/BinPackingProblemSat.csproj b/ortools/sat/samples/BinPackingProblemSat.csproj
new file mode 100644
index 0000000000..542365af44
--- /dev/null
+++ b/ortools/sat/samples/BinPackingProblemSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="BinPackingProblemSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/BinPackingProblem.java b/ortools/sat/samples/BinPackingProblemSat.java
similarity index 100%
rename from ortools/sat/samples/BinPackingProblem.java
rename to ortools/sat/samples/BinPackingProblemSat.java
diff --git a/ortools/sat/samples/BoolOrSample.cs b/ortools/sat/samples/BoolOrSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/BoolOrSample.cs
rename to ortools/sat/samples/BoolOrSampleSat.cs
diff --git a/ortools/sat/samples/BoolOrSample.csproj b/ortools/sat/samples/BoolOrSampleSat.csproj
similarity index 93%
rename from ortools/sat/samples/BoolOrSample.csproj
rename to ortools/sat/samples/BoolOrSampleSat.csproj
index 7b8a29ad5a..9008522f3e 100644
--- a/ortools/sat/samples/BoolOrSample.csproj
+++ b/ortools/sat/samples/BoolOrSampleSat.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="BoolOrSample.cs" />
+    <Compile Include="BoolOrSampleSat.cs" />
     <PackageReference Include="Google.OrTools" Version="6.9.*" />
   </ItemGroup>
 </Project>
diff --git a/ortools/sat/samples/BoolOrSample.java b/ortools/sat/samples/BoolOrSampleSat.java
similarity index 100%
rename from ortools/sat/samples/BoolOrSample.java
rename to ortools/sat/samples/BoolOrSampleSat.java
diff --git a/ortools/sat/samples/ChannelingSample.cs b/ortools/sat/samples/ChannelingSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/ChannelingSample.cs
rename to ortools/sat/samples/ChannelingSampleSat.cs
diff --git a/ortools/sat/samples/ChannelingSampleSat.csproj b/ortools/sat/samples/ChannelingSampleSat.csproj
new file mode 100644
index 0000000000..4c525be7f5
--- /dev/null
+++ b/ortools/sat/samples/ChannelingSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ChannelingSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/ChannelingSample.java b/ortools/sat/samples/ChannelingSampleSat.java
similarity index 100%
rename from ortools/sat/samples/ChannelingSample.java
rename to ortools/sat/samples/ChannelingSampleSat.java
diff --git a/ortools/sat/samples/CpIsFun.cs b/ortools/sat/samples/CpIsFunSat.cs
similarity index 100%
rename from ortools/sat/samples/CpIsFun.cs
rename to ortools/sat/samples/CpIsFunSat.cs
diff --git a/ortools/sat/samples/CpIsFun.csproj b/ortools/sat/samples/CpIsFunSat.csproj
similarity index 94%
rename from ortools/sat/samples/CpIsFun.csproj
rename to ortools/sat/samples/CpIsFunSat.csproj
index fb7ae8194c..4461a9b5f5 100644
--- a/ortools/sat/samples/CpIsFun.csproj
+++ b/ortools/sat/samples/CpIsFunSat.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="CpIsFun.cs" />
+    <Compile Include="CpIsFunSat.cs" />
     <PackageReference Include="Google.OrTools" Version="6.9.*" />
   </ItemGroup>
 </Project>
diff --git a/ortools/sat/samples/CpIsFun.java b/ortools/sat/samples/CpIsFunSat.java
similarity index 100%
rename from ortools/sat/samples/CpIsFun.java
rename to ortools/sat/samples/CpIsFunSat.java
diff --git a/ortools/sat/samples/IntervalSample.csproj b/ortools/sat/samples/IntervalSample.csproj
deleted file mode 100644
index c60d6f9ff3..0000000000
--- a/ortools/sat/samples/IntervalSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="IntervalSample.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/IntervalSample.cs b/ortools/sat/samples/IntervalSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/IntervalSample.cs
rename to ortools/sat/samples/IntervalSampleSat.cs
diff --git a/ortools/sat/samples/BinPackingProblem.csproj b/ortools/sat/samples/IntervalSampleSat.csproj
similarity index 93%
rename from ortools/sat/samples/BinPackingProblem.csproj
rename to ortools/sat/samples/IntervalSampleSat.csproj
index f51ea737c9..2a9e468611 100644
--- a/ortools/sat/samples/BinPackingProblem.csproj
+++ b/ortools/sat/samples/IntervalSampleSat.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="BinPackingProblem.cs" />
+    <Compile Include="IntervalSampleSat.cs" />
     <PackageReference Include="Google.OrTools" Version="6.9.*" />
   </ItemGroup>
 </Project>
diff --git a/ortools/sat/samples/IntervalSample.java b/ortools/sat/samples/IntervalSampleSat.java
similarity index 100%
rename from ortools/sat/samples/IntervalSample.java
rename to ortools/sat/samples/IntervalSampleSat.java
diff --git a/ortools/sat/samples/LiteralSample.csproj b/ortools/sat/samples/LiteralSample.csproj
deleted file mode 100644
index a04cd5f70a..0000000000
--- a/ortools/sat/samples/LiteralSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="LiteralSample.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/LiteralSample.cs b/ortools/sat/samples/LiteralSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/LiteralSample.cs
rename to ortools/sat/samples/LiteralSampleSat.cs
diff --git a/ortools/sat/samples/ChannelingSample.csproj b/ortools/sat/samples/LiteralSampleSat.csproj
similarity index 93%
rename from ortools/sat/samples/ChannelingSample.csproj
rename to ortools/sat/samples/LiteralSampleSat.csproj
index a8dcf89900..0b88398f95 100644
--- a/ortools/sat/samples/ChannelingSample.csproj
+++ b/ortools/sat/samples/LiteralSampleSat.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="ChannelingSample.cs" />
+    <Compile Include="LiteralSampleSat.cs" />
     <PackageReference Include="Google.OrTools" Version="6.9.*" />
   </ItemGroup>
 </Project>
diff --git a/ortools/sat/samples/LiteralSample.java b/ortools/sat/samples/LiteralSampleSat.java
similarity index 100%
rename from ortools/sat/samples/LiteralSample.java
rename to ortools/sat/samples/LiteralSampleSat.java
diff --git a/ortools/sat/samples/NoOverlapSample.csproj b/ortools/sat/samples/NoOverlapSample.csproj
deleted file mode 100644
index a4941d8c1e..0000000000
--- a/ortools/sat/samples/NoOverlapSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="NoOverlapSample.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/NoOverlapSample.cs b/ortools/sat/samples/NoOverlapSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/NoOverlapSample.cs
rename to ortools/sat/samples/NoOverlapSampleSat.cs
diff --git a/ortools/sat/samples/NoOverlapSampleSat.csproj b/ortools/sat/samples/NoOverlapSampleSat.csproj
new file mode 100644
index 0000000000..bcd17a319a
--- /dev/null
+++ b/ortools/sat/samples/NoOverlapSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="NoOverlapSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/NoOverlapSample.java b/ortools/sat/samples/NoOverlapSampleSat.java
similarity index 100%
rename from ortools/sat/samples/NoOverlapSample.java
rename to ortools/sat/samples/NoOverlapSampleSat.java
diff --git a/ortools/sat/samples/OptionalIntervalSample.csproj b/ortools/sat/samples/OptionalIntervalSample.csproj
deleted file mode 100644
index 2a18e65ac9..0000000000
--- a/ortools/sat/samples/OptionalIntervalSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="OptionalIntervalSample.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/OptionalIntervalSample.cs b/ortools/sat/samples/OptionalIntervalSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/OptionalIntervalSample.cs
rename to ortools/sat/samples/OptionalIntervalSampleSat.cs
diff --git a/ortools/sat/samples/OptionalIntervalSampleSat.csproj b/ortools/sat/samples/OptionalIntervalSampleSat.csproj
new file mode 100644
index 0000000000..5e3b8557ad
--- /dev/null
+++ b/ortools/sat/samples/OptionalIntervalSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="OptionalIntervalSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/OptionalIntervalSample.java b/ortools/sat/samples/OptionalIntervalSampleSat.java
similarity index 100%
rename from ortools/sat/samples/OptionalIntervalSample.java
rename to ortools/sat/samples/OptionalIntervalSampleSat.java
diff --git a/ortools/sat/samples/RabbitsAndPheasants.csproj b/ortools/sat/samples/RabbitsAndPheasants.csproj
deleted file mode 100644
index 953084d060..0000000000
--- a/ortools/sat/samples/RabbitsAndPheasants.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="RabbitsAndPheasants.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/RabbitsAndPheasants.cs b/ortools/sat/samples/RabbitsAndPheasantsSat.cs
similarity index 100%
rename from ortools/sat/samples/RabbitsAndPheasants.cs
rename to ortools/sat/samples/RabbitsAndPheasantsSat.cs
diff --git a/ortools/sat/samples/RabbitsAndPheasantsSat.csproj b/ortools/sat/samples/RabbitsAndPheasantsSat.csproj
new file mode 100644
index 0000000000..fb2ecadac2
--- /dev/null
+++ b/ortools/sat/samples/RabbitsAndPheasantsSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="RabbitsAndPheasantsSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/RabbitsAndPheasants.java b/ortools/sat/samples/RabbitsAndPheasantsSat.java
similarity index 100%
rename from ortools/sat/samples/RabbitsAndPheasants.java
rename to ortools/sat/samples/RabbitsAndPheasantsSat.java
diff --git a/ortools/sat/samples/RankingSample.csproj b/ortools/sat/samples/RankingSample.csproj
deleted file mode 100644
index b03e4d4f1e..0000000000
--- a/ortools/sat/samples/RankingSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="RankingSample.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/RankingSample.cs b/ortools/sat/samples/RankingSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/RankingSample.cs
rename to ortools/sat/samples/RankingSampleSat.cs
diff --git a/ortools/sat/samples/CodeSample.csproj b/ortools/sat/samples/RankingSampleSat.csproj
similarity index 93%
rename from ortools/sat/samples/CodeSample.csproj
rename to ortools/sat/samples/RankingSampleSat.csproj
index 60699b72d5..dfab41da1c 100644
--- a/ortools/sat/samples/CodeSample.csproj
+++ b/ortools/sat/samples/RankingSampleSat.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="CodeSample.cs" />
+    <Compile Include="RankingSampleSat.cs" />
     <PackageReference Include="Google.OrTools" Version="6.9.*" />
   </ItemGroup>
 </Project>
diff --git a/ortools/sat/samples/RankingSample.java b/ortools/sat/samples/RankingSampleSat.java
similarity index 100%
rename from ortools/sat/samples/RankingSample.java
rename to ortools/sat/samples/RankingSampleSat.java
diff --git a/ortools/sat/samples/ReifiedSample.csproj b/ortools/sat/samples/ReifiedSample.csproj
deleted file mode 100644
index 73d3b2f321..0000000000
--- a/ortools/sat/samples/ReifiedSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="ReifiedSample.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/ReifiedSample.cs b/ortools/sat/samples/ReifiedSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/ReifiedSample.cs
rename to ortools/sat/samples/ReifiedSampleSat.cs
diff --git a/ortools/sat/samples/ReifiedSampleSat.csproj b/ortools/sat/samples/ReifiedSampleSat.csproj
new file mode 100644
index 0000000000..50c2108296
--- /dev/null
+++ b/ortools/sat/samples/ReifiedSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ReifiedSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/ReifiedSample.java b/ortools/sat/samples/ReifiedSampleSat.java
similarity index 100%
rename from ortools/sat/samples/ReifiedSample.java
rename to ortools/sat/samples/ReifiedSampleSat.java
diff --git a/ortools/sat/samples/SolveAllSolutions.cs b/ortools/sat/samples/SearchForAllSolutionsSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/SolveAllSolutions.cs
rename to ortools/sat/samples/SearchForAllSolutionsSampleSat.cs
diff --git a/ortools/sat/samples/SearchForAllSolutionsSampleSat.csproj b/ortools/sat/samples/SearchForAllSolutionsSampleSat.csproj
new file mode 100644
index 0000000000..6d711f0bc7
--- /dev/null
+++ b/ortools/sat/samples/SearchForAllSolutionsSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SearchForAllSolutionsSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/SolveAllSolutions.java b/ortools/sat/samples/SearchForAllSolutionsSampleSat.java
similarity index 100%
rename from ortools/sat/samples/SolveAllSolutions.java
rename to ortools/sat/samples/SearchForAllSolutionsSampleSat.java
diff --git a/ortools/sat/samples/CodeSample.cs b/ortools/sat/samples/SimpleSatProgram.cs
similarity index 100%
rename from ortools/sat/samples/CodeSample.cs
rename to ortools/sat/samples/SimpleSatProgram.cs
diff --git a/ortools/sat/samples/SimpleSatProgram.csproj b/ortools/sat/samples/SimpleSatProgram.csproj
new file mode 100644
index 0000000000..40bab1de6b
--- /dev/null
+++ b/ortools/sat/samples/SimpleSatProgram.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SimpleSatProgram.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/CodeSample.java b/ortools/sat/samples/SimpleSatProgram.java
similarity index 100%
rename from ortools/sat/samples/CodeSample.java
rename to ortools/sat/samples/SimpleSatProgram.java
diff --git a/ortools/sat/samples/SimpleSolve.csproj b/ortools/sat/samples/SimpleSolve.csproj
deleted file mode 100644
index 1a808d71a7..0000000000
--- a/ortools/sat/samples/SimpleSolve.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="SimpleSolve.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/SimpleSolve.cs b/ortools/sat/samples/SimpleSolveSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/SimpleSolve.cs
rename to ortools/sat/samples/SimpleSolveSampleSat.cs
diff --git a/ortools/sat/samples/SimpleSolveSampleSat.csproj b/ortools/sat/samples/SimpleSolveSampleSat.csproj
new file mode 100644
index 0000000000..0e91f78286
--- /dev/null
+++ b/ortools/sat/samples/SimpleSolveSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SimpleSolveSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/SimpleSolve.java b/ortools/sat/samples/SimpleSolveSampleSat.java
similarity index 100%
rename from ortools/sat/samples/SimpleSolve.java
rename to ortools/sat/samples/SimpleSolveSampleSat.java
diff --git a/ortools/sat/samples/SolveAllSolutions.csproj b/ortools/sat/samples/SolveAllSolutions.csproj
deleted file mode 100644
index 39001e5e5e..0000000000
--- a/ortools/sat/samples/SolveAllSolutions.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="SolveAllSolutions.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/SolveWithIntermediateSolutions.cs b/ortools/sat/samples/SolveAndPrintIntermediateSolutionsSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/SolveWithIntermediateSolutions.cs
rename to ortools/sat/samples/SolveAndPrintIntermediateSolutionsSampleSat.cs
diff --git a/ortools/sat/samples/SolveAndPrintIntermediateSolutionsSampleSat.csproj b/ortools/sat/samples/SolveAndPrintIntermediateSolutionsSampleSat.csproj
new file mode 100644
index 0000000000..9d91b2cb65
--- /dev/null
+++ b/ortools/sat/samples/SolveAndPrintIntermediateSolutionsSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SolveAndPrintIntermediateSolutionsSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/SolveWithIntermediateSolutions.java b/ortools/sat/samples/SolveAndPrintIntermediateSolutionsSampleSat.java
similarity index 100%
rename from ortools/sat/samples/SolveWithIntermediateSolutions.java
rename to ortools/sat/samples/SolveAndPrintIntermediateSolutionsSampleSat.java
diff --git a/ortools/sat/samples/SolveWithIntermediateSolutions.csproj b/ortools/sat/samples/SolveWithIntermediateSolutions.csproj
deleted file mode 100644
index c251636361..0000000000
--- a/ortools/sat/samples/SolveWithIntermediateSolutions.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="SolveWithIntermediateSolutions.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/SolveWithTimeLimit.csproj b/ortools/sat/samples/SolveWithTimeLimit.csproj
deleted file mode 100644
index 274bc4ad8a..0000000000
--- a/ortools/sat/samples/SolveWithTimeLimit.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="SolveWithTimeLimit.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/SolveWithTimeLimit.cs b/ortools/sat/samples/SolveWithTimeLimitSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/SolveWithTimeLimit.cs
rename to ortools/sat/samples/SolveWithTimeLimitSampleSat.cs
diff --git a/ortools/sat/samples/SolveWithTimeLimitSampleSat.csproj b/ortools/sat/samples/SolveWithTimeLimitSampleSat.csproj
new file mode 100644
index 0000000000..7cfd2b3507
--- /dev/null
+++ b/ortools/sat/samples/SolveWithTimeLimitSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SolveWithTimeLimitSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/SolveWithTimeLimit.java b/ortools/sat/samples/SolveWithTimeLimitSampleSat.java
similarity index 100%
rename from ortools/sat/samples/SolveWithTimeLimit.java
rename to ortools/sat/samples/SolveWithTimeLimitSampleSat.java
diff --git a/ortools/sat/samples/StopAfterNSolutions.csproj b/ortools/sat/samples/StopAfterNSolutions.csproj
deleted file mode 100644
index 8d7e19bf7b..0000000000
--- a/ortools/sat/samples/StopAfterNSolutions.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <GenerateTailCalls>true</GenerateTailCalls>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="StopAfterNSolutions.cs" />
-    <PackageReference Include="Google.OrTools" Version="6.9.*" />
-  </ItemGroup>
-</Project>
diff --git a/ortools/sat/samples/StopAfterNSolutions.cs b/ortools/sat/samples/StopAfterNSolutionsSampleSat.cs
similarity index 100%
rename from ortools/sat/samples/StopAfterNSolutions.cs
rename to ortools/sat/samples/StopAfterNSolutionsSampleSat.cs
diff --git a/ortools/sat/samples/StopAfterNSolutionsSampleSat.csproj b/ortools/sat/samples/StopAfterNSolutionsSampleSat.csproj
new file mode 100644
index 0000000000..c27d8ce66b
--- /dev/null
+++ b/ortools/sat/samples/StopAfterNSolutionsSampleSat.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <LangVersion>7.2</LangVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <GenerateTailCalls>true</GenerateTailCalls>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="StopAfterNSolutionsSampleSat.cs" />
+    <PackageReference Include="Google.OrTools" Version="6.9.*" />
+  </ItemGroup>
+</Project>
diff --git a/ortools/sat/samples/StopAfterNSolutions.java b/ortools/sat/samples/StopAfterNSolutionsSampleSat.java
similarity index 100%
rename from ortools/sat/samples/StopAfterNSolutions.java
rename to ortools/sat/samples/StopAfterNSolutionsSampleSat.java
diff --git a/ortools/sat/samples/binpacking_problem.cc b/ortools/sat/samples/binpacking_problem_sat.cc
similarity index 100%
rename from ortools/sat/samples/binpacking_problem.cc
rename to ortools/sat/samples/binpacking_problem_sat.cc
diff --git a/ortools/sat/samples/binpacking_problem.py b/ortools/sat/samples/binpacking_problem_sat.py
similarity index 100%
rename from ortools/sat/samples/binpacking_problem.py
rename to ortools/sat/samples/binpacking_problem_sat.py
diff --git a/ortools/sat/samples/bool_or_sample.cc b/ortools/sat/samples/bool_or_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/bool_or_sample.cc
rename to ortools/sat/samples/bool_or_sample_sat.cc
diff --git a/ortools/sat/samples/bool_or_sample.py b/ortools/sat/samples/bool_or_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/bool_or_sample.py
rename to ortools/sat/samples/bool_or_sample_sat.py
diff --git a/ortools/sat/samples/channeling_sample.cc b/ortools/sat/samples/channeling_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/channeling_sample.cc
rename to ortools/sat/samples/channeling_sample_sat.cc
diff --git a/ortools/sat/samples/channeling_sample.py b/ortools/sat/samples/channeling_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/channeling_sample.py
rename to ortools/sat/samples/channeling_sample_sat.py
diff --git a/ortools/sat/samples/cp_is_fun.cc b/ortools/sat/samples/cp_is_fun_sat.cc
similarity index 100%
rename from ortools/sat/samples/cp_is_fun.cc
rename to ortools/sat/samples/cp_is_fun_sat.cc
diff --git a/ortools/sat/samples/cp_is_fun.py b/ortools/sat/samples/cp_is_fun_sat.py
similarity index 100%
rename from ortools/sat/samples/cp_is_fun.py
rename to ortools/sat/samples/cp_is_fun_sat.py
diff --git a/ortools/sat/samples/interval_sample.cc b/ortools/sat/samples/interval_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/interval_sample.cc
rename to ortools/sat/samples/interval_sample_sat.cc
diff --git a/ortools/sat/samples/interval_sample.py b/ortools/sat/samples/interval_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/interval_sample.py
rename to ortools/sat/samples/interval_sample_sat.py
diff --git a/ortools/sat/samples/literal_sample.cc b/ortools/sat/samples/literal_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/literal_sample.cc
rename to ortools/sat/samples/literal_sample_sat.cc
diff --git a/ortools/sat/samples/literal_sample.py b/ortools/sat/samples/literal_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/literal_sample.py
rename to ortools/sat/samples/literal_sample_sat.py
diff --git a/ortools/sat/samples/minimal_jobshop.py b/ortools/sat/samples/minimal_jobshop_sat.py
similarity index 100%
rename from ortools/sat/samples/minimal_jobshop.py
rename to ortools/sat/samples/minimal_jobshop_sat.py
diff --git a/ortools/sat/samples/no_overlap_sample.cc b/ortools/sat/samples/no_overlap_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/no_overlap_sample.cc
rename to ortools/sat/samples/no_overlap_sample_sat.cc
diff --git a/ortools/sat/samples/no_overlap_sample.py b/ortools/sat/samples/no_overlap_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/no_overlap_sample.py
rename to ortools/sat/samples/no_overlap_sample_sat.py
diff --git a/ortools/sat/samples/optional_interval_sample.cc b/ortools/sat/samples/optional_interval_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/optional_interval_sample.cc
rename to ortools/sat/samples/optional_interval_sample_sat.cc
diff --git a/ortools/sat/samples/optional_interval_sample.py b/ortools/sat/samples/optional_interval_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/optional_interval_sample.py
rename to ortools/sat/samples/optional_interval_sample_sat.py
diff --git a/ortools/sat/samples/rabbits_and_pheasants.cc b/ortools/sat/samples/rabbits_and_pheasants_sat.cc
similarity index 100%
rename from ortools/sat/samples/rabbits_and_pheasants.cc
rename to ortools/sat/samples/rabbits_and_pheasants_sat.cc
diff --git a/ortools/sat/samples/rabbits_and_pheasants.py b/ortools/sat/samples/rabbits_and_pheasants_sat.py
similarity index 100%
rename from ortools/sat/samples/rabbits_and_pheasants.py
rename to ortools/sat/samples/rabbits_and_pheasants_sat.py
diff --git a/ortools/sat/samples/ranking_sample.cc b/ortools/sat/samples/ranking_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/ranking_sample.cc
rename to ortools/sat/samples/ranking_sample_sat.cc
diff --git a/ortools/sat/samples/ranking_sample.py b/ortools/sat/samples/ranking_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/ranking_sample.py
rename to ortools/sat/samples/ranking_sample_sat.py
diff --git a/ortools/sat/samples/reified_sample.cc b/ortools/sat/samples/reified_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/reified_sample.cc
rename to ortools/sat/samples/reified_sample_sat.cc
diff --git a/ortools/sat/samples/reified_sample.py b/ortools/sat/samples/reified_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/reified_sample.py
rename to ortools/sat/samples/reified_sample_sat.py
diff --git a/ortools/sat/samples/solve_all_solutions.cc b/ortools/sat/samples/search_for_all_solutions_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/solve_all_solutions.cc
rename to ortools/sat/samples/search_for_all_solutions_sample_sat.cc
diff --git a/ortools/sat/samples/solve_all_solutions.py b/ortools/sat/samples/search_for_all_solutions_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/solve_all_solutions.py
rename to ortools/sat/samples/search_for_all_solutions_sample_sat.py
diff --git a/ortools/sat/samples/code_sample.cc b/ortools/sat/samples/simple_sat_program.cc
similarity index 100%
rename from ortools/sat/samples/code_sample.cc
rename to ortools/sat/samples/simple_sat_program.cc
diff --git a/ortools/sat/samples/code_sample.py b/ortools/sat/samples/simple_sat_program.py
similarity index 100%
rename from ortools/sat/samples/code_sample.py
rename to ortools/sat/samples/simple_sat_program.py
diff --git a/ortools/sat/samples/simple_solve.cc b/ortools/sat/samples/simple_solve_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/simple_solve.cc
rename to ortools/sat/samples/simple_solve_sample_sat.cc
diff --git a/ortools/sat/samples/simple_solve.py b/ortools/sat/samples/simple_solve_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/simple_solve.py
rename to ortools/sat/samples/simple_solve_sample_sat.py
diff --git a/ortools/sat/samples/solve_with_intermediate_solutions.cc b/ortools/sat/samples/solve_and_print_intermediate_solutions_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/solve_with_intermediate_solutions.cc
rename to ortools/sat/samples/solve_and_print_intermediate_solutions_sample_sat.cc
diff --git a/ortools/sat/samples/solve_with_intermediate_solutions.py b/ortools/sat/samples/solve_and_print_intermediate_solutions_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/solve_with_intermediate_solutions.py
rename to ortools/sat/samples/solve_and_print_intermediate_solutions_sample_sat.py
diff --git a/ortools/sat/samples/solve_with_time_limit.cc b/ortools/sat/samples/solve_with_time_limit_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/solve_with_time_limit.cc
rename to ortools/sat/samples/solve_with_time_limit_sample_sat.cc
diff --git a/ortools/sat/samples/solve_with_time_limit.py b/ortools/sat/samples/solve_with_time_limit_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/solve_with_time_limit.py
rename to ortools/sat/samples/solve_with_time_limit_sample_sat.py
diff --git a/ortools/sat/samples/stop_after_n_solutions.cc b/ortools/sat/samples/stop_after_n_solutions_sample_sat.cc
similarity index 100%
rename from ortools/sat/samples/stop_after_n_solutions.cc
rename to ortools/sat/samples/stop_after_n_solutions_sample_sat.cc
diff --git a/ortools/sat/samples/stop_after_n_solutions.py b/ortools/sat/samples/stop_after_n_solutions_sample_sat.py
similarity index 100%
rename from ortools/sat/samples/stop_after_n_solutions.py
rename to ortools/sat/samples/stop_after_n_solutions_sample_sat.py