diff --git a/modules/img/alg/src/correlate.cc b/modules/img/alg/src/correlate.cc
index f9ba508480516818a296ca88d4666d9ef2f163d7..b473e20c09f1aa089709c53a555846631e740303 100644
--- a/modules/img/alg/src/correlate.cc
+++ b/modules/img/alg/src/correlate.cc
@@ -86,6 +86,6 @@ ImageStateBasePtr ExplicitCorrelateFnc::VisitState(const ImageStateImpl<V,D>& is
 }
 
 }
-template class TEMPLATE_DEF_EXPORT ImageStateConstModOPAlgorithm<alg::ExplicitCorrelateFnc>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateConstModOPAlgorithm<alg::ExplicitCorrelateFnc>;
 }} //  ns
 
diff --git a/modules/img/alg/src/density_slice.cc b/modules/img/alg/src/density_slice.cc
index 2b54526bec69622e258bc34996be0b220191e78b..dc5cedf7f53c903a8c8bea23f2670c1e052cadb0 100644
--- a/modules/img/alg/src/density_slice.cc
+++ b/modules/img/alg/src/density_slice.cc
@@ -54,5 +54,5 @@ void SliceFnc::VisitState(ImageStateImpl<T,D>& isi) const
 }
 
 }
-template class TEMPLATE_DEF_EXPORT ImageStateConstModIPAlgorithm<alg::SliceFnc>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateConstModIPAlgorithm<alg::SliceFnc>;
 }} // ns
diff --git a/modules/img/alg/src/fourier_filters.cc b/modules/img/alg/src/fourier_filters.cc
index 57462ecfeae38dc26f31a210e5fd8b63b334506e..a130b6f4cf27275aee648e9aa1974e5fc1ef64b7 100644
--- a/modules/img/alg/src/fourier_filters.cc
+++ b/modules/img/alg/src/fourier_filters.cc
@@ -254,12 +254,14 @@ typedef ImageStateConstModIPAlgorithm<ButterworthLPBase> ButterworthLP;
 }}}} // ns
 
 #ifndef NO_EXPL_INST
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::LPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::HPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianLPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianHPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::FermiLPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::ButterworthLPBase>;
+namespace ost { namespace img { namespace image_state {
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::LPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::HPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianLPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianHPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::FermiLPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::ButterworthLPBase>;
+}}} // ns
 #endif
 
 
diff --git a/modules/img/alg/src/gaussian_gradient_magnitude.cc b/modules/img/alg/src/gaussian_gradient_magnitude.cc
index ad3c32702d7ded48bea1358375be5f0aaaceda4a..b8c760be613d5627e416c2d25bd24d622adb8a59 100644
--- a/modules/img/alg/src/gaussian_gradient_magnitude.cc
+++ b/modules/img/alg/src/gaussian_gradient_magnitude.cc
@@ -143,6 +143,6 @@ void GaussianGradientMagnitudeFilterBase::calcBVals( Real q )
 
 } // ns
 
-template class TEMPLATE_DEF_EXPORT ImageStateModIPAlgorithm<alg::GaussianGradientMagnitudeFilterBase>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateModIPAlgorithm<alg::GaussianGradientMagnitudeFilterBase>;
 
 }}
diff --git a/modules/img/alg/src/gaussian_laplacian.cc b/modules/img/alg/src/gaussian_laplacian.cc
index 1a05a568db8eab412fccb1fc86b0e59bca2a5a5b..fbe0426448d4d3a7e8fbf6cdd4348304cfb32105 100644
--- a/modules/img/alg/src/gaussian_laplacian.cc
+++ b/modules/img/alg/src/gaussian_laplacian.cc
@@ -137,5 +137,5 @@ void GaussianLaplacianFilterBase::calcBVals( Real q )
 
 } // ns
 
-template class TEMPLATE_DEF_EXPORT ImageStateModIPAlgorithm<alg::GaussianLaplacianFilterBase>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateModIPAlgorithm<alg::GaussianLaplacianFilterBase>;
 }}
diff --git a/modules/img/alg/src/highest_peak_search_3d.cc b/modules/img/alg/src/highest_peak_search_3d.cc
index 913586a08a631285f7991f133be8d1890beb5b33..a4a80e78e7e066ef576545a5d9f974bdf587ccc4 100644
--- a/modules/img/alg/src/highest_peak_search_3d.cc
+++ b/modules/img/alg/src/highest_peak_search_3d.cc
@@ -177,7 +177,7 @@ template <typename T, class D>
 } // ns
 
 
-template class TEMPLATE_DEF_EXPORT ImageStateNonModAlgorithm<alg::HighestPeakSearch3DBase>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateNonModAlgorithm<alg::HighestPeakSearch3DBase>;
 
 
 }}  // ns