diff --git a/gtsam/linear/tests/testNoiseModel.cpp b/gtsam/linear/tests/testNoiseModel.cpp
index 67023f591..7a0e02722 100644
--- a/gtsam/linear/tests/testNoiseModel.cpp
+++ b/gtsam/linear/tests/testNoiseModel.cpp
@@ -134,14 +134,14 @@ TEST(NoiseModel, equals)
 //TEST(NoiseModel, ConstrainedSmart )
 //{
 //  Gaussian::shared_ptr nonconstrained = Constrained::MixedSigmas(Vector_(3, sigma, 0.0, sigma), true);
-//  Diagonal::shared_ptr n1 = boost::shared_dynamic_cast<Diagonal>(nonconstrained);
-//  Constrained::shared_ptr n2 = boost::shared_dynamic_cast<Constrained>(nonconstrained);
+//  Diagonal::shared_ptr n1 = boost::dynamic_pointer_cast<Diagonal>(nonconstrained);
+//  Constrained::shared_ptr n2 = boost::dynamic_pointer_cast<Constrained>(nonconstrained);
 //  EXPECT(n1);
 //  EXPECT(!n2);
 //
 //  Gaussian::shared_ptr constrained = Constrained::MixedSigmas(zero(3), true);
-//  Diagonal::shared_ptr c1 = boost::shared_dynamic_cast<Diagonal>(constrained);
-//  Constrained::shared_ptr c2 = boost::shared_dynamic_cast<Constrained>(constrained);
+//  Diagonal::shared_ptr c1 = boost::dynamic_pointer_cast<Diagonal>(constrained);
+//  Constrained::shared_ptr c2 = boost::dynamic_pointer_cast<Constrained>(constrained);
 //  EXPECT(c1);
 //  EXPECT(c2);
 //}
diff --git a/gtsam/nonlinear/LinearContainerFactor.cpp b/gtsam/nonlinear/LinearContainerFactor.cpp
index c0c072571..126b0f3df 100644
--- a/gtsam/nonlinear/LinearContainerFactor.cpp
+++ b/gtsam/nonlinear/LinearContainerFactor.cpp
@@ -169,10 +169,10 @@ GaussianFactor::shared_ptr LinearContainerFactor::linearize(
   // clone and reorder linear factor to final ordering
   GaussianFactor::shared_ptr linFactor = order(localOrdering);
   if (isJacobian()) {
-    JacobianFactor::shared_ptr jacFactor = boost::shared_dynamic_cast<JacobianFactor>(linFactor);
+    JacobianFactor::shared_ptr jacFactor = boost::dynamic_pointer_cast<JacobianFactor>(linFactor);
     jacFactor->getb() += jacFactor->unweighted_error(delta) + jacFactor->getb();
   } else {
-    HessianFactor::shared_ptr hesFactor = boost::shared_dynamic_cast<HessianFactor>(linFactor);
+    HessianFactor::shared_ptr hesFactor = boost::dynamic_pointer_cast<HessianFactor>(linFactor);
     size_t dim = hesFactor->linearTerm().size();
     Eigen::Block<HessianFactor::Block> Gview = hesFactor->info().block(0, 0, dim, dim);
     Vector G_delta = Gview.selfadjointView<Eigen::Upper>() * deltaVector;
@@ -188,22 +188,22 @@ GaussianFactor::shared_ptr LinearContainerFactor::linearize(
 
 /* ************************************************************************* */
 bool LinearContainerFactor::isJacobian() const {
-  return boost::shared_dynamic_cast<JacobianFactor>(factor_);
+  return boost::dynamic_pointer_cast<JacobianFactor>(factor_);
 }
 
 /* ************************************************************************* */
 bool LinearContainerFactor::isHessian() const {
-  return boost::shared_dynamic_cast<HessianFactor>(factor_);
+  return boost::dynamic_pointer_cast<HessianFactor>(factor_);
 }
 
 /* ************************************************************************* */
 JacobianFactor::shared_ptr LinearContainerFactor::toJacobian() const {
-  return boost::shared_dynamic_cast<JacobianFactor>(factor_);
+  return boost::dynamic_pointer_cast<JacobianFactor>(factor_);
 }
 
 /* ************************************************************************* */
 HessianFactor::shared_ptr LinearContainerFactor::toHessian() const {
-  return boost::shared_dynamic_cast<HessianFactor>(factor_);
+  return boost::dynamic_pointer_cast<HessianFactor>(factor_);
 }
 
 /* ************************************************************************* */
diff --git a/gtsam/nonlinear/NonlinearFactor.h b/gtsam/nonlinear/NonlinearFactor.h
index 71a5a237b..0d4633879 100644
--- a/gtsam/nonlinear/NonlinearFactor.h
+++ b/gtsam/nonlinear/NonlinearFactor.h
@@ -338,7 +338,7 @@ public:
 
     // TODO pass unwhitened + noise model to Gaussian factor
     noiseModel::Constrained::shared_ptr constrained =
-        boost::shared_dynamic_cast<noiseModel::Constrained>(this->noiseModel_);
+        boost::dynamic_pointer_cast<noiseModel::Constrained>(this->noiseModel_);
     if(constrained)
       return GaussianFactor::shared_ptr(
           new JacobianFactor(terms, b, constrained->unit()));
diff --git a/tests/testExtendedKalmanFilter.cpp b/tests/testExtendedKalmanFilter.cpp
index c19bcd4c9..6bdfa7eee 100644
--- a/tests/testExtendedKalmanFilter.cpp
+++ b/tests/testExtendedKalmanFilter.cpp
@@ -199,7 +199,7 @@ public:
     Vector b = -evaluateError(x1, x2, A1, A2);
     const Index var1 = ordering[key1()], var2 = ordering[key2()];
     SharedDiagonal constrained =
-        boost::shared_dynamic_cast<noiseModel::Constrained>(this->noiseModel_);
+        boost::dynamic_pointer_cast<noiseModel::Constrained>(this->noiseModel_);
     if (constrained.get() != NULL) {
       return JacobianFactor::shared_ptr(new JacobianFactor(var1, A1, var2,
           A2, b, constrained));
@@ -335,7 +335,7 @@ public:
     Vector b = -evaluateError(x1, A1);
     const Index var1 = ordering[key()];
     SharedDiagonal constrained =
-        boost::shared_dynamic_cast<noiseModel::Constrained>(this->noiseModel_);
+        boost::dynamic_pointer_cast<noiseModel::Constrained>(this->noiseModel_);
     if (constrained.get() != NULL) {
       return JacobianFactor::shared_ptr(new JacobianFactor(var1, A1, b, constrained));
     }