diff --git a/examples/UnorderedLinear.cpp b/examples/UnorderedLinear.cpp
index 896b1c696..ff2fb0f52 100644
--- a/examples/UnorderedLinear.cpp
+++ b/examples/UnorderedLinear.cpp
@@ -1,7 +1,7 @@
 
 #include <gtsam/slam/dataset.h>
 #include <gtsam/geometry/Pose2.h>
-#include <gtsam/inference/VariableIndexOrdered.h>
+#include <gtsam/inference/VariableIndex.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/VectorValues.h>
 #include <gtsam/linear/GaussianMultifrontalSolver.h>
diff --git a/examples/elaboratePoint2KalmanFilter.cpp b/examples/elaboratePoint2KalmanFilter.cpp
index b4c86c0b7..69ef31931 100644
--- a/examples/elaboratePoint2KalmanFilter.cpp
+++ b/examples/elaboratePoint2KalmanFilter.cpp
@@ -22,11 +22,11 @@
 
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Symbol.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
-#include <gtsam/linear/GaussianBayesNetOrdered.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianBayesNet.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/NoiseModel.h>
 #include <gtsam/geometry/Point2.h>
 
diff --git a/gtsam/linear/GaussianBayesTree-inl.h b/gtsam/linear/GaussianBayesTree-inl.h
index 7b4ac6858..d6ddf6eb9 100644
--- a/gtsam/linear/GaussianBayesTree-inl.h
+++ b/gtsam/linear/GaussianBayesTree-inl.h
@@ -21,7 +21,7 @@
 
 #include <boost/foreach.hpp>
 
-#include <gtsam/linear/GaussianBayesTreeOrdered.h> // Only to help Eclipse
+#include <gtsam/linear/GaussianBayesTree.h> // Only to help Eclipse
 
 #include <stdarg.h>
 
diff --git a/gtsam/linear/GaussianBayesTreeOrdered-inl.h b/gtsam/linear/GaussianBayesTreeOrdered-inl.h
index 7b4ac6858..d6ddf6eb9 100644
--- a/gtsam/linear/GaussianBayesTreeOrdered-inl.h
+++ b/gtsam/linear/GaussianBayesTreeOrdered-inl.h
@@ -21,7 +21,7 @@
 
 #include <boost/foreach.hpp>
 
-#include <gtsam/linear/GaussianBayesTreeOrdered.h> // Only to help Eclipse
+#include <gtsam/linear/GaussianBayesTree.h> // Only to help Eclipse
 
 #include <stdarg.h>
 
diff --git a/gtsam/linear/tests/timeFactorOverhead.cpp b/gtsam/linear/tests/timeFactorOverhead.cpp
index dc7f17917..ea8ed8d12 100644
--- a/gtsam/linear/tests/timeFactorOverhead.cpp
+++ b/gtsam/linear/tests/timeFactorOverhead.cpp
@@ -16,7 +16,7 @@
  * @date    Aug 20, 2010
  */
 
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/NoiseModel.h>
 #include <gtsam/inference/EliminationTreeOrdered-inl.h>
 
diff --git a/gtsam/linear/tests/timeGaussianFactor.cpp b/gtsam/linear/tests/timeGaussianFactor.cpp
index 8f6f440a4..833c01f71 100644
--- a/gtsam/linear/tests/timeGaussianFactor.cpp
+++ b/gtsam/linear/tests/timeGaussianFactor.cpp
@@ -25,9 +25,9 @@ using namespace std;
 #include <boost/assign/std/list.hpp> // for operator += in Ordering
 
 #include <gtsam/base/Matrix.h>
-#include <gtsam/linear/JacobianFactorOrdered.h>
-#include <gtsam/linear/JacobianFactorOrdered.h>
-#include <gtsam/linear/GaussianConditionalOrdered.h>
+#include <gtsam/linear/JacobianFactor.h>
+#include <gtsam/linear/JacobianFactor.h>
+#include <gtsam/linear/GaussianConditional.h>
 #include <gtsam/linear/NoiseModel.h>
 
 using namespace gtsam;
diff --git a/gtsam/linear/tests/timeSLAMlike.cpp b/gtsam/linear/tests/timeSLAMlike.cpp
index 820282d25..96fa69b88 100644
--- a/gtsam/linear/tests/timeSLAMlike.cpp
+++ b/gtsam/linear/tests/timeSLAMlike.cpp
@@ -16,7 +16,7 @@
  * @date    Aug 30, 2010
  */
 
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/NoiseModel.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
 #include <gtsam/linear/GaussianMultifrontalSolver.h>
diff --git a/gtsam/nonlinear/ExtendedKalmanFilter-inl.h b/gtsam/nonlinear/ExtendedKalmanFilter-inl.h
index ba659914c..4cb6a2943 100644
--- a/gtsam/nonlinear/ExtendedKalmanFilter-inl.h
+++ b/gtsam/nonlinear/ExtendedKalmanFilter-inl.h
@@ -21,8 +21,8 @@
 #include <gtsam/nonlinear/ExtendedKalmanFilter.h>
 #include <gtsam/nonlinear/NonlinearFactor.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
-#include <gtsam/linear/GaussianBayesNetOrdered.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianBayesNet.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 
 namespace gtsam {
 
diff --git a/gtsam/nonlinear/ISAM2-impl.h b/gtsam/nonlinear/ISAM2-impl.h
index dcd85148e..38fdd9b4f 100644
--- a/gtsam/nonlinear/ISAM2-impl.h
+++ b/gtsam/nonlinear/ISAM2-impl.h
@@ -19,7 +19,7 @@
 
 #if 0
 
-#include <gtsam/linear/GaussianBayesTreeOrdered.h>
+#include <gtsam/linear/GaussianBayesTree.h>
 #include <gtsam/nonlinear/ISAM2.h>
 
 namespace gtsam {
diff --git a/gtsam/nonlinear/ISAM2-inl.h b/gtsam/nonlinear/ISAM2-inl.h
index a00ca5737..388f4c9d7 100644
--- a/gtsam/nonlinear/ISAM2-inl.h
+++ b/gtsam/nonlinear/ISAM2-inl.h
@@ -20,8 +20,8 @@
 #pragma once
 
 #include <stack>
-#include <gtsam/inference/FactorGraphOrdered.h>
-#include <gtsam/linear/JacobianFactorOrdered.h>
+#include <gtsam/inference/FactorGraph.h>
+#include <gtsam/linear/JacobianFactor.h>
 
 namespace gtsam {
 
diff --git a/gtsam/nonlinear/ISAM2.cpp b/gtsam/nonlinear/ISAM2.cpp
index fcd1d1f4f..6ed9f8838 100644
--- a/gtsam/nonlinear/ISAM2.cpp
+++ b/gtsam/nonlinear/ISAM2.cpp
@@ -26,11 +26,11 @@ using namespace boost::assign;
 
 #include <gtsam/base/timing.h>
 #include <gtsam/base/debug.h>
-#include <gtsam/inference/BayesTreeOrdered.h>
-#include <gtsam/linear/GaussianJunctionTreeOrdered.h>
+#include <gtsam/inference/BayesTree.h>
+#include <gtsam/linear/GaussianJunctionTree.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
-#include <gtsam/linear/HessianFactorOrdered.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/HessianFactor.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 
 #include <gtsam/nonlinear/ISAM2.h>
 #include <gtsam/nonlinear/DoglegOptimizerImpl.h>
diff --git a/gtsam/nonlinear/ISAM2.h b/gtsam/nonlinear/ISAM2.h
index 1e4a8bca6..59ab2517f 100644
--- a/gtsam/nonlinear/ISAM2.h
+++ b/gtsam/nonlinear/ISAM2.h
@@ -23,7 +23,7 @@
 
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/DoglegOptimizerImpl.h>
-#include <gtsam/linear/GaussianBayesTreeOrdered.h>
+#include <gtsam/linear/GaussianBayesTree.h>
 
 #include <boost/variant.hpp>
 
diff --git a/gtsam/nonlinear/Marginals.h b/gtsam/nonlinear/Marginals.h
index ccce60c33..1fea64b3a 100644
--- a/gtsam/nonlinear/Marginals.h
+++ b/gtsam/nonlinear/Marginals.h
@@ -21,7 +21,7 @@
 #if 0
 
 #include <gtsam/base/blockMatrices.h>
-#include <gtsam/linear/GaussianBayesTreeOrdered.h>
+#include <gtsam/linear/GaussianBayesTree.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
 
diff --git a/gtsam/nonlinear/NonlinearISAM.cpp b/gtsam/nonlinear/NonlinearISAM.cpp
index 5e8f1f1af..32124ef2a 100644
--- a/gtsam/nonlinear/NonlinearISAM.cpp
+++ b/gtsam/nonlinear/NonlinearISAM.cpp
@@ -19,9 +19,9 @@
 
 #include <gtsam/nonlinear/NonlinearISAM.h>
 
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/inference/ISAMOrdered-inl.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 
 #include <boost/foreach.hpp>
 
diff --git a/gtsam/nonlinear/NonlinearISAM.h b/gtsam/nonlinear/NonlinearISAM.h
index 9bf7f8bff..54042727f 100644
--- a/gtsam/nonlinear/NonlinearISAM.h
+++ b/gtsam/nonlinear/NonlinearISAM.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
-#include <gtsam/linear/GaussianISAMOrdered.h>
+#include <gtsam/linear/GaussianISAM.h>
 
 namespace gtsam {
 /**
diff --git a/gtsam/nonlinear/WhiteNoiseFactor.h b/gtsam/nonlinear/WhiteNoiseFactor.h
index ad55abe52..4e473ae3d 100644
--- a/gtsam/nonlinear/WhiteNoiseFactor.h
+++ b/gtsam/nonlinear/WhiteNoiseFactor.h
@@ -18,7 +18,7 @@
  */
 
 #include <gtsam/nonlinear/NonlinearFactor.h>
-#include <gtsam/linear/HessianFactorOrdered.h>
+#include <gtsam/linear/HessianFactor.h>
 #include <gtsam/base/LieScalar.h>
 #include <cmath>
 
diff --git a/gtsam/nonlinear/summarization.h b/gtsam/nonlinear/summarization.h
index 68bad9b34..599a90bd1 100644
--- a/gtsam/nonlinear/summarization.h
+++ b/gtsam/nonlinear/summarization.h
@@ -14,8 +14,8 @@
 #include <gtsam/dllexport.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/nonlinear/Ordering.h>
 
 namespace gtsam {
 
diff --git a/gtsam/slam/AntiFactor.h b/gtsam/slam/AntiFactor.h
index cb11d5af9..eba330ec8 100644
--- a/gtsam/slam/AntiFactor.h
+++ b/gtsam/slam/AntiFactor.h
@@ -18,7 +18,7 @@
 #include <ostream>
 
 #include <gtsam/nonlinear/NonlinearFactor.h>
-#include <gtsam/linear/GaussianFactorOrdered.h>
+#include <gtsam/linear/GaussianFactor.h>
 
 namespace gtsam {
 
diff --git a/gtsam/slam/tests/testGeneralSFMFactor.cpp b/gtsam/slam/tests/testGeneralSFMFactor.cpp
index 414d0ba62..0fc5dacfd 100644
--- a/gtsam/slam/tests/testGeneralSFMFactor.cpp
+++ b/gtsam/slam/tests/testGeneralSFMFactor.cpp
@@ -23,7 +23,7 @@
 #include <gtsam/nonlinear/Symbol.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
-#include <gtsam/linear/VectorValuesOrdered.h>
+#include <gtsam/linear/VectorValues.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/PinholeCamera.h>
 #include <gtsam/base/Testable.h>
diff --git a/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp b/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
index 96deddde5..a79d45a11 100644
--- a/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
+++ b/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
@@ -20,10 +20,10 @@
 #include <gtsam/slam/RangeFactor.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Symbol.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
-#include <gtsam/linear/VectorValuesOrdered.h>
+#include <gtsam/linear/VectorValues.h>
 #include <gtsam/geometry/Point3.h>
 #include <gtsam/geometry/Cal3Bundler.h>
 #include <gtsam/geometry/PinholeCamera.h>
diff --git a/gtsam_unstable/linear/bayesTreeOperations.h b/gtsam_unstable/linear/bayesTreeOperations.h
index d28404731..5d2788f7b 100644
--- a/gtsam_unstable/linear/bayesTreeOperations.h
+++ b/gtsam_unstable/linear/bayesTreeOperations.h
@@ -10,9 +10,9 @@
 #pragma once
 
 #include <gtsam_unstable/base/dllexport.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
-#include <gtsam/linear/GaussianBayesTreeOrdered.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/linear/GaussianBayesTree.h>
+#include <gtsam/nonlinear/Ordering.h>
 
 namespace gtsam {
 
diff --git a/gtsam_unstable/linear/conditioning.h b/gtsam_unstable/linear/conditioning.h
index 259eadf16..41c9d1318 100644
--- a/gtsam_unstable/linear/conditioning.h
+++ b/gtsam_unstable/linear/conditioning.h
@@ -10,9 +10,9 @@
 #pragma once
 
 #include <gtsam_unstable/base/dllexport.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
-#include <gtsam/linear/GaussianBayesTreeOrdered.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/linear/GaussianBayesTree.h>
+#include <gtsam/nonlinear/Ordering.h>
 
 namespace gtsam {
 
diff --git a/gtsam_unstable/nonlinear/BatchFixedLagSmoother.cpp b/gtsam_unstable/nonlinear/BatchFixedLagSmoother.cpp
index ec54dbc20..236c3cfad 100644
--- a/gtsam_unstable/nonlinear/BatchFixedLagSmoother.cpp
+++ b/gtsam_unstable/nonlinear/BatchFixedLagSmoother.cpp
@@ -19,10 +19,10 @@
 
 #include <gtsam_unstable/nonlinear/BatchFixedLagSmoother.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
-#include <gtsam/linear/GaussianJunctionTreeOrdered.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
-#include <gtsam/linear/GaussianFactorOrdered.h>
-#include <gtsam/inference/inferenceOrdered.h>
+#include <gtsam/linear/GaussianJunctionTree.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/linear/GaussianFactor.h>
+#include <gtsam/inference/inference.h>
 #include <gtsam/base/debug.h>
 
 namespace gtsam {
diff --git a/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp b/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp
index cfddc6e0b..22485c011 100644
--- a/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp
+++ b/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp
@@ -18,7 +18,7 @@
 
 #include <gtsam_unstable/nonlinear/ConcurrentBatchFilter.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
-#include <gtsam/linear/GaussianJunctionTreeOrdered.h>
+#include <gtsam/linear/GaussianJunctionTree.h>
 #include <gtsam/base/timing.h>
 #include <gtsam/base/debug.h>
 
diff --git a/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp b/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp
index 4a56a29a6..f25f9b294 100644
--- a/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp
+++ b/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp
@@ -18,7 +18,7 @@
 
 #include <gtsam_unstable/nonlinear/ConcurrentBatchSmoother.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
-#include <gtsam/linear/GaussianJunctionTreeOrdered.h>
+#include <gtsam/linear/GaussianJunctionTree.h>
 #include <gtsam/base/timing.h>
 #include <gtsam/base/debug.h>
 
diff --git a/gtsam_unstable/nonlinear/LinearizedFactor.h b/gtsam_unstable/nonlinear/LinearizedFactor.h
index 2fcab9207..0d11eb7e0 100644
--- a/gtsam_unstable/nonlinear/LinearizedFactor.h
+++ b/gtsam_unstable/nonlinear/LinearizedFactor.h
@@ -19,10 +19,10 @@
 
 #include <vector>
 #include <gtsam_unstable/base/dllexport.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/NonlinearFactor.h>
-#include <gtsam/linear/JacobianFactorOrdered.h>
-#include <gtsam/linear/HessianFactorOrdered.h>
+#include <gtsam/linear/JacobianFactor.h>
+#include <gtsam/linear/HessianFactor.h>
 #include <gtsam/base/blockMatrices.h>
 
 namespace gtsam {
diff --git a/gtsam_unstable/nonlinear/summarization.h b/gtsam_unstable/nonlinear/summarization.h
index 79e2c49b2..cb46e05f2 100644
--- a/gtsam_unstable/nonlinear/summarization.h
+++ b/gtsam_unstable/nonlinear/summarization.h
@@ -12,8 +12,8 @@
 #include <gtsam_unstable/base/dllexport.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/nonlinear/Ordering.h>
 
 namespace gtsam {
 
diff --git a/tests/simulated3D.h b/tests/simulated3D.h
index 462873ea1..46945558a 100644
--- a/tests/simulated3D.h
+++ b/tests/simulated3D.h
@@ -21,7 +21,7 @@
 
 #include <gtsam/base/Matrix.h>
 #include <gtsam/geometry/Point3.h>
-#include <gtsam/linear/VectorValuesOrdered.h>
+#include <gtsam/linear/VectorValues.h>
 #include <gtsam/nonlinear/NonlinearFactor.h>
 
 // \namespace
diff --git a/tests/testDoglegOptimizer.cpp b/tests/testDoglegOptimizer.cpp
index 1a5fb77e6..6244590d7 100644
--- a/tests/testDoglegOptimizer.cpp
+++ b/tests/testDoglegOptimizer.cpp
@@ -18,10 +18,10 @@
 #include <tests/smallExample.h>
 #include <gtsam/nonlinear/DoglegOptimizerImpl.h>
 #include <gtsam/nonlinear/Symbol.h>
-#include <gtsam/linear/JacobianFactorOrdered.h>
+#include <gtsam/linear/JacobianFactor.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
-#include <gtsam/linear/GaussianBayesTreeOrdered.h>
-#include <gtsam/inference/BayesTreeOrdered.h>
+#include <gtsam/linear/GaussianBayesTree.h>
+#include <gtsam/inference/BayesTree.h>
 #include <gtsam/base/numericalDerivative.h>
 
 #include <CppUnitLite/TestHarness.h>
diff --git a/tests/testGaussianBayesTree.cpp b/tests/testGaussianBayesTree.cpp
index 71bc4b2f7..2d0cde7a0 100644
--- a/tests/testGaussianBayesTree.cpp
+++ b/tests/testGaussianBayesTree.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Symbol.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
 #include <gtsam/linear/GaussianMultifrontalSolver.h>
diff --git a/tests/testGaussianFactorGraphB.cpp b/tests/testGaussianFactorGraphB.cpp
index 157d57cf3..9275d9dea 100644
--- a/tests/testGaussianFactorGraphB.cpp
+++ b/tests/testGaussianFactorGraphB.cpp
@@ -17,10 +17,10 @@
 
 #include <tests/smallExample.h>
 #include <gtsam/nonlinear/Symbol.h>
-#include <gtsam/linear/GaussianBayesNetOrdered.h>
+#include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
-#include <gtsam/inference/SymbolicFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/inference/SymbolicFactorGraph.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/Matrix.h>
 #include <gtsam/base/Testable.h>
diff --git a/tests/testGaussianISAM2.cpp b/tests/testGaussianISAM2.cpp
index fd4b31348..bd6ffc5cf 100644
--- a/tests/testGaussianISAM2.cpp
+++ b/tests/testGaussianISAM2.cpp
@@ -9,12 +9,12 @@
 #include <gtsam/base/LieVector.h>
 #include <gtsam/geometry/Point2.h>
 #include <gtsam/geometry/Pose2.h>
-#include <gtsam/inference/SymbolicFactorGraphOrdered.h>
-#include <gtsam/linear/GaussianBayesNetOrdered.h>
+#include <gtsam/inference/SymbolicFactorGraph.h>
+#include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
-#include <gtsam/linear/GaussianBayesTreeOrdered.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/linear/GaussianBayesTree.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Values.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/ISAM2.h>
diff --git a/tests/testGaussianJunctionTreeB.cpp b/tests/testGaussianJunctionTreeB.cpp
index 13fcf5ccb..4b6769935 100644
--- a/tests/testGaussianJunctionTreeB.cpp
+++ b/tests/testGaussianJunctionTreeB.cpp
@@ -21,12 +21,12 @@
 #include <gtsam/slam/BearingRangeFactor.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Symbol.h>
-#include <gtsam/linear/GaussianJunctionTreeOrdered.h>
+#include <gtsam/linear/GaussianJunctionTree.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
 #include <gtsam/linear/GaussianMultifrontalSolver.h>
-#include <gtsam/inference/BayesTreeOrdered.h>
+#include <gtsam/inference/BayesTree.h>
 #include <gtsam/geometry/Pose2.h>
 #include <gtsam/base/TestableAssertions.h>
 #include <gtsam/base/debug.h>
diff --git a/tests/testIterative.cpp b/tests/testIterative.cpp
index 80aa52ca4..0097170b5 100644
--- a/tests/testIterative.cpp
+++ b/tests/testIterative.cpp
@@ -19,7 +19,7 @@
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Symbol.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
 #include <gtsam/linear/iterative.h>
diff --git a/tests/testNonlinearFactor.cpp b/tests/testNonlinearFactor.cpp
index beb08fac3..bb9a52942 100644
--- a/tests/testNonlinearFactor.cpp
+++ b/tests/testNonlinearFactor.cpp
@@ -30,7 +30,7 @@
 #include <gtsam/base/LieVector.h>
 #include <tests/smallExample.h>
 #include <tests/simulated2D.h>
-#include <gtsam/linear/GaussianFactorOrdered.h>
+#include <gtsam/linear/GaussianFactor.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Symbol.h>
 
diff --git a/tests/testNonlinearFactorGraph.cpp b/tests/testNonlinearFactorGraph.cpp
index 3f96e6593..a3e792055 100644
--- a/tests/testNonlinearFactorGraph.cpp
+++ b/tests/testNonlinearFactorGraph.cpp
@@ -30,7 +30,7 @@ using namespace boost::assign;
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/Matrix.h>
 #include <tests/smallExample.h>
-#include <gtsam/inference/FactorGraphOrdered.h>
+#include <gtsam/inference/FactorGraph.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Symbol.h>
 
diff --git a/tests/testNonlinearOptimizer.cpp b/tests/testNonlinearOptimizer.cpp
index eda207688..418ec0bb0 100644
--- a/tests/testNonlinearOptimizer.cpp
+++ b/tests/testNonlinearOptimizer.cpp
@@ -25,7 +25,7 @@
 #include <gtsam/nonlinear/GaussNewtonOptimizer.h>
 #include <gtsam/nonlinear/DoglegOptimizer.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/NoiseModel.h>
 #include <gtsam/geometry/Pose2.h>
 #include <gtsam/base/Matrix.h>
diff --git a/tests/testSerializationSLAM.cpp b/tests/testSerializationSLAM.cpp
index 942500aee..2214ee23d 100644
--- a/tests/testSerializationSLAM.cpp
+++ b/tests/testSerializationSLAM.cpp
@@ -30,7 +30,7 @@
 #include <gtsam/slam/StereoFactor.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
 #include <gtsam/nonlinear/Symbol.h>
-#include <gtsam/linear/GaussianISAMOrdered.h>
+#include <gtsam/linear/GaussianISAM.h>
 #include <gtsam/linear/GaussianMultifrontalSolver.h>
 #include <gtsam/base/LieVector.h>
 #include <gtsam/base/LieMatrix.h>
diff --git a/tests/testSubgraphPreconditioner.cpp b/tests/testSubgraphPreconditioner.cpp
index 044ddb974..0252ea909 100644
--- a/tests/testSubgraphPreconditioner.cpp
+++ b/tests/testSubgraphPreconditioner.cpp
@@ -16,10 +16,10 @@
  **/
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Symbol.h>
 #include <gtsam/linear/iterative.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
 #include <gtsam/linear/SubgraphPreconditioner.h>
 #include <gtsam/base/numericalDerivative.h>
diff --git a/tests/testSubgraphSolver.cpp b/tests/testSubgraphSolver.cpp
index 017a70af5..0b8f74922 100644
--- a/tests/testSubgraphSolver.cpp
+++ b/tests/testSubgraphSolver.cpp
@@ -16,11 +16,11 @@
  **/
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/OrderingOrdered.h>
+#include <gtsam/nonlinear/Ordering.h>
 #include <gtsam/nonlinear/Symbol.h>
-#include <gtsam/linear/GaussianBayesNetOrdered.h>
+#include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/iterative.h>
-#include <gtsam/linear/GaussianFactorGraphOrdered.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/SubgraphSolver.h>
 #include <gtsam/inference/EliminationTreeOrdered-inl.h>
 #include <gtsam/base/numericalDerivative.h>