diff --git a/.travis.yml b/.travis.yml
index 372e576fa5e7aac0be462fd007560d5475959176..c35a904b4793300d2318d1628803e0e941923363 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,4 +51,4 @@ script:
 after_success:
     - python -c 'import moose'
     - python -c 'import moogli'
-    - cd _build_moose_core && ctest --output-on-failure
+    - cd __moose-core_build && ctest --output-on-failure
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f24a5348dbd4c6b73ca60f945c575b0b24b3b94..f3b7d54d827c443dd939173979ca7f1928efef1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ add_custom_target(moose ALL)
 
 ## intialize paths
 set(PYMOOSE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/moose-core")
-set(PYMOOSE_BUILD_DIR ${CMAKE_BINARY_DIR}/__moose_core_build)
-set(PYMOOSE_INSTALL_DIR ${CMAKE_BINARY_DIR}/__moose_core_install)
+set(PYMOOSE_BUILD_DIR ${CMAKE_BINARY_DIR}/__moose-core_build)
+set(PYMOOSE_INSTALL_DIR ${CMAKE_BINARY_DIR}/__moose-core_install)
 
 set(MOOSE_GUI_DIR ${CMAKE_SOURCE_DIR}/moose-gui)
 set(MOOSE_GUI_INSTALL_DIR ${CMAKE_BINARY_DIR}/__moose-gui_install)
@@ -30,13 +30,13 @@ file(MAKE_DIRECTORY ${PYMOOSE_BUILD_DIR})
 # different platform.
 set(OUTPUT_MOOSEBIN ${PYMOOSE_BUILD_DIR}/moose.bin)
 
-configure_file( ${CMAKE_SOURCE_DIR}/build_moose_core.sh.in 
-    ${CMAKE_BINARY_DIR}/build_moose_core.sh )
+configure_file( ${CMAKE_SOURCE_DIR}/build_moose-core.sh.in 
+    ${CMAKE_BINARY_DIR}/build_moose-core.sh )
 
 # Build pymoose module.
 add_custom_target( moose-core ALL DEPENDS ${OUTPUT_MOOSEBIN} )
 add_custom_command( OUTPUT ${OUTPUT_MOOSEBIN}
-    COMMAND MAKE=$(MAKE) bash -c ${CMAKE_BINARY_DIR}/build_moose_core.sh
+    COMMAND MAKE=$(MAKE) bash -c ${CMAKE_BINARY_DIR}/build_moose-core.sh
     VERBATIM
     )
 
@@ -67,14 +67,16 @@ install(DIRECTORY ${PYMOOSE_INSTALL_DIR}/
     PATTERN ".git" EXCLUDE
     )
 
-install(DIRECTORY ${MOOSE_GUI_INSTALL_DIR}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/moose/gui
-    PATTERN ".git" EXCLUDE
+install(DIRECTORY ${MOOSE_GUI_INSTALL_DIR}/
+    DESTINATION lib/moose/gui
+    PATTERN ".git*" EXCLUDE
     )
 
-install(DIRECTORY ${MOOSE_EXAMPLE_DIR}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
-    PATTERN ".git" EXCLUDE 
+install(DIRECTORY ${MOOSE_EXAMPLE_DIR}/
+    DESTINATION lib/moose/moose-examples
+    PATTERN ".git*" EXCLUDE 
+    PATTERN "_travis*" EXCLUDE
+    PATTERN ".travis*" EXCLUDE
     )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/moose.in ${CMAKE_BINARY_DIR}/moose )
diff --git a/build_moose_core.sh.in b/build_moose-core.sh.in
similarity index 100%
rename from build_moose_core.sh.in
rename to build_moose-core.sh.in
diff --git a/moose-core/VERSION b/moose-core/VERSION
index 0eac0f049d7a3a484d117933bb24a319e65ed444..abee1689d0657609e05f20e74cec34912c6fd9e1 100644
--- a/moose-core/VERSION
+++ b/moose-core/VERSION
@@ -1 +1 @@
-3.1.1-67-g5dd1e81
\ No newline at end of file
+3.1.1-68-g407f570
\ No newline at end of file