diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h b/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h
index 1d1baf1021e87970b771f8b54b8dca028b2a49fa..d169f4012ff450ab144ac55855ed882ba4a26bc3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h
@@ -1,5 +1,5 @@
 #ifndef MANTID_ALGORITHM_PADDINGANDAPODUIZTION_H_
-#define MANTID_ALGORITHM_FPADDINGANDAPODUIZTION_H_
+#define MANTID_ALGORITHM_PADDINGANDAPODUIZTION_H_
 
 //----------------------------------------------------------------------
 // Includes
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 File change history is stored at: <https://github.com/mantidproject/mantid>
 Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class DLLExport FFTPreProcessing : public API::Algorithm {
+class DLLExport PaddingAndApodization : public API::Algorithm {
 public:
   /// Algorithm's name for identification overriding a virtual method
   const std::string name() const override { return "FFTPreProcessing"; }
diff --git a/Framework/Algorithms/src/ApodizationFunctions.cpp b/Framework/Algorithms/src/ApodizationFunctions.cpp
index 20aa3bb72c75335345a0841eb1a6194cf18e77c4..60a5d43bba8cae144c6e9d11abffcfba8335bdd8 100644
--- a/Framework/Algorithms/src/ApodizationFunctions.cpp
+++ b/Framework/Algorithms/src/ApodizationFunctions.cpp
@@ -1,9 +1,12 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidAlgorithms/ApodizationFunctionHelper.h"
+#include "MantidAlgorithms/ApodizationFunctions.h"
 #include <cmath>
 
+
+namespace Mantid {
+namespace Algorithms {
 /**
 * Returns the evaluation of the Lorentz
 * (an exponential decay)
@@ -38,3 +41,6 @@ double gaussian(const double time, const double decayConstant) {
 * @returns :: Function evaluation
 */
 double none(const double, const double) { return 1.; }
+
+}
+}
diff --git a/Framework/Algorithms/test/PaddingAndApodization.h b/Framework/Algorithms/test/PaddingAndApodizationTest.h
similarity index 99%
rename from Framework/Algorithms/test/PaddingAndApodization.h
rename to Framework/Algorithms/test/PaddingAndApodizationTest.h
index f640aa9c07b91fbc9d2adabcd5c2770a13968121..74f7b58ab6c640dd34a6bb77691435863a14b9a1 100644
--- a/Framework/Algorithms/test/PaddingAndApodization.h
+++ b/Framework/Algorithms/test/PaddingAndApodizationTest.h
@@ -46,7 +46,7 @@ class PaddingAndApodizationTest : public CxxTest::TestSuite {
 public:
   // This pair of boilerplate methods prevent the suite being created statically
   // This means the constructor isn't called when running other tests
-  static PaddingAndApodizationTestt *createSuite() {
+  static PaddingAndApodizationTest *createSuite() {
     return new PaddingAndApodizationTest();
   }
   static void destroySuite(PaddingAndApodizationTest *suite) { delete suite; }
diff --git a/docs/source/algorithms/FFTPreProcessing-v1.rst b/docs/source/algorithms/PaddingAndApodization-v1.rst
similarity index 89%
rename from docs/source/algorithms/FFTPreProcessing-v1.rst
rename to docs/source/algorithms/PaddingAndApodization-v1.rst
index fac857341ab7bed144f6bed356d65b8ae2419736..e423f48e61db9705a6b41c6120c897558f3c29c8 100644
--- a/docs/source/algorithms/FFTPreProcessing-v1.rst
+++ b/docs/source/algorithms/PaddingAndApodization-v1.rst
@@ -39,7 +39,7 @@ Usage
    y = [100, 150, 50, 10, 5]
    x = [1,2,3,4,5,6]
    input = CreateWorkspace(x,y)
-   output=FFTPreProcessing(InputWorkspace=input,ApodizationFunction="Gaussian",DecayConstant=2.44,Padding=0,)
+   output=PaddingAndApodization(InputWorkspace=input,ApodizationFunction="Gaussian",DecayConstant=2.44,Padding=0,)
    print  "output: ",['{0:.2f}'.format(value)  for value in output.readY(0)]
    
 Output:
@@ -57,7 +57,7 @@ Output:
    y = [100, 150, 50, 10, 5]
    x = [1,2,3,4,5,6]
    input = CreateWorkspace(x,y)
-   output=FFTPreProcessing(InputWorkspace=input,Padding=2,)
+   output=PaddingAndApodization(InputWorkspace=input,Padding=2,)
    print  "output: ",['{0:.2f}'.format(value)  for value in output.readY(0)]
    
 Output:
@@ -75,7 +75,7 @@ Output:
    y = [100, 150, 50, 10, 5]
    x = [1,2,3,4,5,6]
    input = CreateWorkspace(x,y)
-   output=FFTPreProcessing(InputWorkspace=input,ApodizationFunction="Gaussian",DecayConstant=2.44,Padding=2,)
+   output=PaddingAndApodization(InputWorkspace=input,ApodizationFunction="Gaussian",DecayConstant=2.44,Padding=2,)
    print  "output: ",['{0:.2f}'.format(value)  for value in output.readY(0)]
    
 Output:
diff --git a/docs/source/release/v3.11.0/framework.rst b/docs/source/release/v3.11.0/framework.rst
index 2442ef64de5378566bd76fb85539f657ff37703e..f0bb55b16b42a06c5cda30638c585ae30d1cef47 100644
--- a/docs/source/release/v3.11.0/framework.rst
+++ b/docs/source/release/v3.11.0/framework.rst
@@ -16,7 +16,7 @@ New
 ###
 
 - :ref:`ConjoinXRuns <algm-ConjoinXRuns>` performs concatenation of the workspaces into a single one by handling the sample logs merging as in :ref:`MergeRuns <algm-MergeRuns>`.
-- :ref:`FFTPreProcessing <algm-FFTPreProcessing-v1>` a new algorithm for padding data and adding an apodization function.
+- :ref:`PaddingAndApodization <algm-PaddingAndApodization-v1>` a new algorithm for padding data and adding an apodization function.
 
 Improved