diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h b/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h
index 890eacac88b6c3eb3ba1c20b4854b2b162406a27..4ed70ba322b381d664fa5db4ad306a188032d493 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h
@@ -36,10 +36,12 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 
 namespace Mantid {
 namespace Algorithms {
+namespace ApodizationFunctions {
 double lorentz(double time, double decayConstant);
 double gaussian(const double time, const double decayConstant);
 double none(const double, const double);
 }
 }
+}
 
 #endif /*MANTID_APODIZATIONFUNCTIONS_H_*/
diff --git a/Framework/Algorithms/src/ApodizationFunctions.cpp b/Framework/Algorithms/src/ApodizationFunctions.cpp
index 9207a340981719d982068c5b126e588e8d225503..f3641e71ea8b08ec25a20756b87a5d9b7d462825 100644
--- a/Framework/Algorithms/src/ApodizationFunctions.cpp
+++ b/Framework/Algorithms/src/ApodizationFunctions.cpp
@@ -6,6 +6,7 @@
 
 namespace Mantid {
 namespace Algorithms {
+namespace ApodizationFunctions {
 /**
 * Returns the evaluation of the Lorentz
 * (an exponential decay)
@@ -42,3 +43,4 @@ double gaussian(const double time, const double decayConstant) {
 double none(const double, const double) { return 1.; }
 }
 }
+}
\ No newline at end of file
diff --git a/Framework/Algorithms/src/PaddingAndApodization.cpp b/Framework/Algorithms/src/PaddingAndApodization.cpp
index 90b8bca699735d13ac1e49e5deccb53cac701ffc..f6e5086ab4efcae3d14894df9cac81b8bca7321f 100644
--- a/Framework/Algorithms/src/PaddingAndApodization.cpp
+++ b/Framework/Algorithms/src/PaddingAndApodization.cpp
@@ -134,11 +134,11 @@ typedef double (*fptr)(const double time, const double decayConstant);
 */
 fptr PaddingAndApodization::getApodizationFunction(const std::string method) {
   if (method == "None") {
-    return none;
+    return ApodizationFunctions::none;
   } else if (method == "Lorentz") {
-    return lorentz;
+    return ApodizationFunctions::lorentz;
   } else if (method == "Gaussian") {
-    return gaussian;
+    return ApodizationFunctions::gaussian;
   }
   throw std::invalid_argument("The apodization function selected " + method +
                               " is not a valid option");