diff --git a/packages/teuchos/comm/src/CMakeLists.txt b/packages/teuchos/comm/src/CMakeLists.txt
index b4f800dbfbcf..6cab915529d1 100644
--- a/packages/teuchos/comm/src/CMakeLists.txt
+++ b/packages/teuchos/comm/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(SOURCES "")
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)
diff --git a/packages/teuchos/core/src/CMakeLists.txt b/packages/teuchos/core/src/CMakeLists.txt
index 5b560b0e9fb7..8b547b4d4a18 100644
--- a/packages/teuchos/core/src/CMakeLists.txt
+++ b/packages/teuchos/core/src/CMakeLists.txt
@@ -62,7 +62,7 @@ APPEND_SET(HEADERS
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(HEADERS ${DIR}/*.c)
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
diff --git a/packages/teuchos/numerics/src/CMakeLists.txt b/packages/teuchos/numerics/src/CMakeLists.txt
index b8a722e0d14d..6d28cc546fa3 100644
--- a/packages/teuchos/numerics/src/CMakeLists.txt
+++ b/packages/teuchos/numerics/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(SOURCES "")
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)
 
diff --git a/packages/teuchos/parameterlist/src/CMakeLists.txt b/packages/teuchos/parameterlist/src/CMakeLists.txt
index c61642b40e2e..74e2651a65d7 100644
--- a/packages/teuchos/parameterlist/src/CMakeLists.txt
+++ b/packages/teuchos/parameterlist/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(SOURCES "")
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)
 
diff --git a/packages/teuchos/parser/src/CMakeLists.txt b/packages/teuchos/parser/src/CMakeLists.txt
index 9c82d55611aa..78594cdf9126 100644
--- a/packages/teuchos/parser/src/CMakeLists.txt
+++ b/packages/teuchos/parser/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(HEADERS
   "${DIR}/Teuchos_FiniteAutomaton.hpp"
diff --git a/packages/teuchos/remainder/src/CMakeLists.txt b/packages/teuchos/remainder/src/CMakeLists.txt
index 19a92176e1d4..6cead79d7d56 100644
--- a/packages/teuchos/remainder/src/CMakeLists.txt
+++ b/packages/teuchos/remainder/src/CMakeLists.txt
@@ -15,7 +15,7 @@ APPEND_SET(HEADERS
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)