diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34b05b21e..3125fc3e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
 # Set some options the user may choose
 # Uncomment the below if you want the user to choose a parallelization library
 OPTION(USE_MPI "Use the MPI library for parallelization" OFF)
-OPTION(USE_OPENMP "Use OpenMP for parallelization" OFF)
+OPTION(USE_OPENMP "Use OpenMP for parallelization" ON)
 
 # This INCLUDE statement executes code that sets the compile flags for DEBUG,
 # RELEASE, and TESTING.  You should  review this file and make sure the flags 
@@ -40,7 +40,6 @@ INCLUDE(${CMAKE_MODULE_PATH}/SetFortranFlags.cmake)
 # taken care of here, such as the fact that the FindOpenMP routine doesn't know
 # about Fortran.
 INCLUDE(${CMAKE_MODULE_PATH}/SetParallelizationLibrary.cmake)
-
 INCLUDE(${CMAKE_MODULE_PATH}/SetUpNetCDF.cmake)
 
 # There is an error in CMAKE with this flag for pgf90.  Unset it
@@ -54,7 +53,7 @@ ENDIF(FCNAME STREQUAL "pgf90")
 ############################################################
 
 # Define the executable name
-SET(FOOEXE swiftest_driver)
+SET(SWIFTEST_DRIVER swiftest_driver)
 
 # Define some directories
 SET(SRC ${CMAKE_SOURCE_DIR}/src)
diff --git a/cmake/Modules/FindOpenMP_Fortran.cmake b/cmake/Modules/FindOpenMP_Fortran.cmake
index c8e0ca2b4..32777569e 100644
--- a/cmake/Modules/FindOpenMP_Fortran.cmake
+++ b/cmake/Modules/FindOpenMP_Fortran.cmake
@@ -26,14 +26,14 @@
 INCLUDE (${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 
 SET (OpenMP_Fortran_FLAG_CANDIDATES
-     #Microsoft Visual Studio
-     "/openmp"
-     #Intel windows
-     "/Qopenmp" 
      #Intel
      "-qopenmp" 
+     #Intel windows
+     "/Qopenmp" 
      #Gnu
      "-fopenmp"
+     #Portland Group
+     "-mp"
      #Empty, if compiler automatically accepts openmp
      " "
      #Sun
@@ -42,8 +42,6 @@ SET (OpenMP_Fortran_FLAG_CANDIDATES
      "+Oopenmp"
      #IBM XL C/c++
      "-qsmp"
-     #Portland Group
-     "-mp"
 )
 
 IF (DEFINED OpenMP_Fortran_FLAGS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 25411a4dc..b4204732c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,26 +104,26 @@ SET(FOO_src
 )
 
 # Define the executable in terms of the source files
-ADD_EXECUTABLE(${FOOEXE} ${FOO_src})
+ADD_EXECUTABLE(${SWIFTEST_DRIVER} ${FOO_src})
 
 #####################################################
 # Add the needed libraries and special compiler flags
 #####################################################
 
 # Uncomment if you need to link to BLAS and LAPACK
-TARGET_LINK_LIBRARIES(${FOOEXE} ${NETCDF_LIBRARIES} ${NETCDF_FORTRAN_LIBRARIES})
+TARGET_LINK_LIBRARIES(${SWIFTEST_DRIVER} ${NETCDF_LIBRARIES} ${NETCDF_FORTRAN_LIBRARIES})
 
 # Uncomment if you have parallization
 IF(USE_OPENMP)
-    SET_TARGET_PROPERTIES(${FOOEXE} PROPERTIES
+    SET_TARGET_PROPERTIES(${SWIFTEST_DRIVER} PROPERTIES
                           COMPILE_FLAGS "${OpenMP_Fortran_FLAGS}"
                           LINK_FLAGS "${OpenMP_Fortran_FLAGS}")
 ELSEIF(USE_MPI)
-    SET_TARGET_PROPERTIES(${FOOEXE} PROPERTIES
+    SET_TARGET_PROPERTIES(${SWIFTEST_DRIVER} PROPERTIES
                           COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS}"
                           LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
     INCLUDE_DIRECTORIES(${MPI_Fortran_INCLUDE_PATH})
-    TARGET_LINK_LIBRARIES(${FOOEXE} ${MPI_Fortran_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${SWIFTEST_DRIVER} ${MPI_Fortran_LIBRARIES})
 ENDIF(USE_OPENMP)
 
 
@@ -137,4 +137,4 @@ IF(WIN32)
 ELSE()
     SET(CMAKE_INSTALL_PREFIX /usr/local)
 ENDIF(WIN32)
-INSTALL(TARGETS ${FOOEXE} RUNTIME DESTINATION bin)
\ No newline at end of file
+INSTALL(TARGETS ${SWIFTEST_DRIVER} RUNTIME DESTINATION bin)
\ No newline at end of file