diff --git a/.gitignore b/.gitignore
index d4a55291f6..28f53e08f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,5 +71,5 @@ nupic/bindings/proto/*.capnp
 # Pip stuff
 dist/
 nupic.egg-info/
-nupic/*cpp_region.*
+nupic/*py_region.*
 temp/
diff --git a/.nupic_modules b/.nupic_modules
index 02a86fd75a..86b983d6b8 100644
--- a/.nupic_modules
+++ b/.nupic_modules
@@ -1,3 +1,3 @@
 # Default nupic.core dependencies (override in optional .nupic_config)
 NUPIC_CORE_REMOTE = 'git://github.com/numenta/nupic.core.git'
-NUPIC_CORE_COMMITISH = 'cb55ebd9633923040176db0c041945f190d69800'
+NUPIC_CORE_COMMITISH = '140a176ef1f53bb5014e60cec5a26ecc0498d23e'
diff --git a/extensions/py_region/PyRegion.cpp b/extensions/py_region/PyRegion.cpp
index a512d676df..865cf9eb64 100644
--- a/extensions/py_region/PyRegion.cpp
+++ b/extensions/py_region/PyRegion.cpp
@@ -20,7 +20,7 @@
  * ---------------------------------------------------------------------
  */
 
-#include <cpp_region/PyRegion.hpp>
+#include <py_region/PyRegion.hpp>
 #include <numpy/arrayobject.h>
 #include <iostream>
 #include <sstream>
diff --git a/setup.py b/setup.py
index 1f30863687..39fef738f2 100644
--- a/setup.py
+++ b/setup.py
@@ -625,8 +625,8 @@ def postProcess():
   shutil.copy(
     nupicCoreReleaseDir + "/bin/py_region_test", REPO_DIR + "/bin"
   )
-  # Copy cpp_region located at build dir into source dir
-  shutil.copy(buildDir + "/nupic/" + getLibPrefix(platform) + "cpp_region" +
+  # Copy py_region located at build dir into source dir
+  shutil.copy(buildDir + "/nupic/" + getLibPrefix(platform) + "py_region" +
               getSharedLibExtension(platform), REPO_DIR + "/nupic")
 
 options = getCommandLineOptions()