diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt
index 225cc69fe..d5b60838d 100644
--- a/tutorial/CMakeLists.txt
+++ b/tutorial/CMakeLists.txt
@@ -19,46 +19,46 @@ project(VTKm_tut)
 #Find the VTK-m package
 find_package(VTKm REQUIRED QUIET)
 
-add_executable(tut_io tut_io.cxx)
-target_link_libraries(tut_io vtkm_filter vtkm_io)
+add_executable(io io.cxx)
+target_link_libraries(io vtkm_filter vtkm_io)
 
-add_executable(tut_contour tut_contour.cxx)
-target_link_libraries(tut_contour vtkm_filter vtkm_io)
+add_executable(contour contour.cxx)
+target_link_libraries(contour vtkm_filter vtkm_io)
 
-add_executable(tut_contour_2fields tut_contour_2fields.cxx)
-target_link_libraries(tut_contour_2fields vtkm_filter vtkm_io)
+add_executable(contour_two_fields contour_two_fields.cxx)
+target_link_libraries(contour_two_fields vtkm_filter vtkm_io)
 
-add_executable(tut_2filters tut_2filters.cxx)
-target_link_libraries(tut_2filters vtkm_filter vtkm_io)
+add_executable(two_filters two_filters.cxx)
+target_link_libraries(two_filters vtkm_filter vtkm_io)
 
-add_executable(tut_mag_grad tut_mag_grad.cxx)
-target_link_libraries(tut_mag_grad vtkm_filter vtkm_io)
+add_executable(mag_grad mag_grad.cxx)
+target_link_libraries(mag_grad vtkm_filter vtkm_io)
 
 if (VTKm_ENABLE_RENDERING)
-  add_executable(tut_rendering tut_rendering.cxx)
-  target_link_libraries(tut_rendering vtkm_filter vtkm_io vtkm_rendering)
+  add_executable(rendering rendering.cxx)
+  target_link_libraries(rendering vtkm_filter vtkm_io vtkm_rendering)
 endif()
 
-add_executable(tut_error_handling tut_error_handling.cxx)
-target_link_libraries(tut_error_handling vtkm_filter vtkm_io)
+add_executable(error_handling error_handling.cxx)
+target_link_libraries(error_handling vtkm_filter vtkm_io)
 
-add_executable(tut_logging tut_logging.cxx)
-target_link_libraries(tut_logging vtkm_filter vtkm_io)
+add_executable(logging logging.cxx)
+target_link_libraries(logging vtkm_filter vtkm_io)
 
-add_executable(tut_point_to_cell tut_point_to_cell.cxx)
-target_link_libraries(tut_point_to_cell vtkm_cont vtkm_filter vtkm_io)
+add_executable(point_to_cell point_to_cell.cxx)
+target_link_libraries(point_to_cell vtkm_cont vtkm_filter vtkm_io)
 
-add_executable(tut_extract_edges tut_extract_edges.cxx)
-target_link_libraries(tut_extract_edges vtkm_cont vtkm_filter vtkm_io)
+add_executable(extract_edges extract_edges.cxx)
+target_link_libraries(extract_edges vtkm_cont vtkm_filter vtkm_io)
 
 
-set(tutorial_targets tut_io tut_contour tut_contour_2fields tut_2filters tut_mag_grad tut_error_handling tut_logging tut_point_to_cell tut_extract_edges)
+set(tutorial_targets io contour contour_two_fields two_filters mag_grad error_handling logging point_to_cell extract_edges)
 
-set(tutorial_sources tut_io.cxx tut_contour.cxx tut_contour_2fields.cxx tut_2filters.cxx tut_mag_grad.cxx tut_error_handling.cxx tut_logging.cxx tut_point_to_cell.cxx tut_extract_edges.cxx)
+set(tutorial_sources io.cxx contour.cxx contour_two_fields.cxx two_filters.cxx mag_grad.cxx error_handling.cxx logging.cxx point_to_cell.cxx extract_edges.cxx)
 
 if (VTKm_ENABLE_RENDERING)
-  list(APPEND tutorial_sources tut_rendering.cxx)
-  list(APPEND tutorial_targets tut_rendering)
+  list(APPEND tutorial_sources rendering.cxx)
+  list(APPEND tutorial_targets rendering)
 endif()
 
 
@@ -70,4 +70,4 @@ vtkm_add_target_information(${tutorial_targets}
 
 
 # Copy the data file to be adjacent to the binaries
-file(GENERATE OUTPUT "$<TARGET_FILE_DIR:tut_io>/data/kitchen.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/kitchen.vtk")
+file(GENERATE OUTPUT "$<TARGET_FILE_DIR:mag_grad>/data/kitchen.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/kitchen.vtk")
diff --git a/tutorial/tut_contour.cxx b/tutorial/contour.cxx
similarity index 100%
rename from tutorial/tut_contour.cxx
rename to tutorial/contour.cxx
diff --git a/tutorial/tut_contour_2fields.cxx b/tutorial/contour_two_fields.cxx
similarity index 100%
rename from tutorial/tut_contour_2fields.cxx
rename to tutorial/contour_two_fields.cxx
diff --git a/tutorial/tut_error_handling.cxx b/tutorial/error_handling.cxx
similarity index 100%
rename from tutorial/tut_error_handling.cxx
rename to tutorial/error_handling.cxx
diff --git a/tutorial/tut_extract_edges.cxx b/tutorial/extract_edges.cxx
similarity index 100%
rename from tutorial/tut_extract_edges.cxx
rename to tutorial/extract_edges.cxx
diff --git a/tutorial/tut_io.cxx b/tutorial/io.cxx
similarity index 100%
rename from tutorial/tut_io.cxx
rename to tutorial/io.cxx
diff --git a/tutorial/tut_logging.cxx b/tutorial/logging.cxx
similarity index 100%
rename from tutorial/tut_logging.cxx
rename to tutorial/logging.cxx
diff --git a/tutorial/tut_mag_grad.cxx b/tutorial/mag_grad.cxx
similarity index 100%
rename from tutorial/tut_mag_grad.cxx
rename to tutorial/mag_grad.cxx
diff --git a/tutorial/tut_mag_grad_generalized.cxx b/tutorial/mag_grad_generalized.cxx
similarity index 100%
rename from tutorial/tut_mag_grad_generalized.cxx
rename to tutorial/mag_grad_generalized.cxx
diff --git a/tutorial/tut_point_to_cell.cxx b/tutorial/point_to_cell.cxx
similarity index 100%
rename from tutorial/tut_point_to_cell.cxx
rename to tutorial/point_to_cell.cxx
diff --git a/tutorial/tut_rendering.cxx b/tutorial/rendering.cxx
similarity index 100%
rename from tutorial/tut_rendering.cxx
rename to tutorial/rendering.cxx
diff --git a/tutorial/tut_2filters.cxx b/tutorial/two_filters.cxx
similarity index 100%
rename from tutorial/tut_2filters.cxx
rename to tutorial/two_filters.cxx