diff --git a/test/TestLogisticRegression.cpp b/test/TestLogisticRegression.cpp
index 5fa3032f8..7c3f15387 100644
--- a/test/TestLogisticRegression.cpp
+++ b/test/TestLogisticRegression.cpp
@@ -105,12 +105,12 @@ TEST(TestLogisticRegressionAlgorithm, TestMainLogisticRegressionManualCopy)
     std::shared_ptr<kp::Tensor> y{ new kp::Tensor({ 0, 0, 0, 1, 1 }) };
 
     std::shared_ptr<kp::Tensor> wIn{ new kp::Tensor(
-      wInVec, kp::Tensor::TensorTypes::eStaging) };
+      wInVec, kp::Tensor::TensorTypes::eHost) };
     std::shared_ptr<kp::Tensor> wOutI{ new kp::Tensor({ 0, 0, 0, 0, 0 }) };
     std::shared_ptr<kp::Tensor> wOutJ{ new kp::Tensor({ 0, 0, 0, 0, 0 }) };
 
     std::shared_ptr<kp::Tensor> bIn{ new kp::Tensor(
-      bInVec, kp::Tensor::TensorTypes::eStaging) };
+      bInVec, kp::Tensor::TensorTypes::eHost) };
     std::shared_ptr<kp::Tensor> bOut{ new kp::Tensor({ 0, 0, 0, 0, 0 }) };
 
     std::shared_ptr<kp::Tensor> lOut{ new kp::Tensor({ 0, 0, 0, 0, 0 }) };
diff --git a/test/TestManager.cpp b/test/TestManager.cpp
index 3076b2a62..198e617af 100644
--- a/test/TestManager.cpp
+++ b/test/TestManager.cpp
@@ -126,7 +126,7 @@ TEST(TestManager, TestCreateInitTensor)
     EXPECT_EQ(tensorB->data(), std::vector<float>({ 0, 1, 2 }));
 
     std::shared_ptr<kp::Tensor> tensorC =
-      mgr.buildTensor({ 0, 0, 0 }, kp::Tensor::TensorTypes::eStaging);
+      mgr.buildTensor({ 0, 0, 0 }, kp::Tensor::TensorTypes::eHost);
 
     mgr.evalOpDefault<kp::OpTensorCopy>({ tensorA, tensorC });
 
diff --git a/test/TestOpTensorCopy.cpp b/test/TestOpTensorCopy.cpp
index ab5b67402..0e840cad6 100644
--- a/test/TestOpTensorCopy.cpp
+++ b/test/TestOpTensorCopy.cpp
@@ -58,7 +58,7 @@ TEST(TestOpTensorCopy, CopyDeviceToDeviceTensorMulti)
     EXPECT_EQ(tensorA->data(), tensorC->data());
 }
 
-TEST(TestOpTensorCopy, CopyDeviceToStagingTensor)
+TEST(TestOpTensorCopy, CopyDeviceToHostTensor)
 {
 
     kp::Manager mgr;
@@ -68,7 +68,7 @@ TEST(TestOpTensorCopy, CopyDeviceToStagingTensor)
 
     std::shared_ptr<kp::Tensor> tensorA{ new kp::Tensor(testVecA) };
     std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor(
-      testVecB, kp::Tensor::TensorTypes::eStaging) };
+      testVecB, kp::Tensor::TensorTypes::eHost) };
 
     mgr.evalOpDefault<kp::OpTensorCreate>({ tensorA, tensorB });
 
@@ -84,7 +84,7 @@ TEST(TestOpTensorCopy, CopyDeviceToStagingTensor)
     EXPECT_EQ(tensorA->data(), tensorB->data());
 }
 
-TEST(TestOpTensorCopy, CopyStagingToDeviceTensor)
+TEST(TestOpTensorCopy, CopyHostToDeviceTensor)
 {
 
     kp::Manager mgr;
@@ -93,7 +93,7 @@ TEST(TestOpTensorCopy, CopyStagingToDeviceTensor)
     std::vector<float> testVecB{ 0, 0, 0 };
 
     std::shared_ptr<kp::Tensor> tensorA{ new kp::Tensor(
-      testVecA, kp::Tensor::TensorTypes::eStaging) };
+      testVecA, kp::Tensor::TensorTypes::eHost) };
     std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor(testVecB) };
 
     mgr.evalOpDefault<kp::OpTensorCreate>({ tensorA, tensorB });
@@ -110,7 +110,7 @@ TEST(TestOpTensorCopy, CopyStagingToDeviceTensor)
     EXPECT_EQ(tensorA->data(), tensorB->data());
 }
 
-TEST(TestOpTensorCopy, CopyStagingToStagingTensor)
+TEST(TestOpTensorCopy, CopyHostToHostTensor)
 {
 
     kp::Manager mgr;
@@ -119,9 +119,9 @@ TEST(TestOpTensorCopy, CopyStagingToStagingTensor)
     std::vector<float> testVecB{ 0, 0, 0 };
 
     std::shared_ptr<kp::Tensor> tensorA{ new kp::Tensor(
-      testVecA, kp::Tensor::TensorTypes::eStaging) };
+      testVecA, kp::Tensor::TensorTypes::eHost) };
     std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor(
-      testVecB, kp::Tensor::TensorTypes::eStaging) };
+      testVecB, kp::Tensor::TensorTypes::eHost) };
 
     mgr.evalOpDefault<kp::OpTensorCreate>({ tensorA, tensorB });
 
@@ -145,7 +145,7 @@ TEST(TestOpTensorCopy, SingleTensorShouldFail)
     std::vector<float> testVecA{ 9, 8, 7 };
 
     std::shared_ptr<kp::Tensor> tensorA{ new kp::Tensor(
-      testVecA, kp::Tensor::TensorTypes::eStaging) };
+      testVecA, kp::Tensor::TensorTypes::eHost) };
 
     mgr.evalOpDefault<kp::OpTensorCreate>({ tensorA });
 
diff --git a/test/TestTensor.cpp b/test/TestTensor.cpp
index 42731bcfe..5e54e8585 100644
--- a/test/TestTensor.cpp
+++ b/test/TestTensor.cpp
@@ -17,9 +17,9 @@ TEST(TestTensor, CopyFromHostData)
     std::vector<float> vecB{ 0, 0, 0 };
 
     std::shared_ptr<kp::Tensor> tensorA =
-      std::make_shared<kp::Tensor>(vecA, kp::Tensor::TensorTypes::eStaging);
+      std::make_shared<kp::Tensor>(vecA, kp::Tensor::TensorTypes::eHost);
     std::shared_ptr<kp::Tensor> tensorB =
-      std::make_shared<kp::Tensor>(vecB, kp::Tensor::TensorTypes::eStaging);
+      std::make_shared<kp::Tensor>(vecB, kp::Tensor::TensorTypes::eHost);
 
     kp::Manager mgr;