diff --git a/nifty/operators/__init__.py b/nifty/operators/__init__.py
index 7406201f099b53a6b4b319b825341b0cfaeee0fc..1026adea32c0d15be477b0660efbfc0e518e8efb 100644
--- a/nifty/operators/__init__.py
+++ b/nifty/operators/__init__.py
@@ -27,7 +27,7 @@ from diagonal_operator import DiagonalOperator
 
 from endomorphic_operator import EndomorphicOperator
 
-from smooth_operator import SmoothOperator
+from smoothing_operator import SmoothingOperator
 
 from fft_operator import *
 
diff --git a/nifty/operators/smooth_operator/__init__.py b/nifty/operators/smooth_operator/__init__.py
deleted file mode 100644
index ea6c6b66bc4c8e531fa5f0ce43b5aec802ee9177..0000000000000000000000000000000000000000
--- a/nifty/operators/smooth_operator/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from smooth_operator import SmoothOperator
diff --git a/nifty/operators/smoothing_operator/__init__.py b/nifty/operators/smoothing_operator/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..9ffc9daef297c18b51d99126706950742e5f5a42
--- /dev/null
+++ b/nifty/operators/smoothing_operator/__init__.py
@@ -0,0 +1 @@
+from smoothing_operator import SmoothingOperator
diff --git a/nifty/operators/smooth_operator/smooth_operator.py b/nifty/operators/smoothing_operator/smoothing_operator.py
similarity index 98%
rename from nifty/operators/smooth_operator/smooth_operator.py
rename to nifty/operators/smoothing_operator/smoothing_operator.py
index d708721e06369b0886986b8dd1336a59f9c35d2c..4f5e5b66374d28b813682e51960140b3e83acdd1 100644
--- a/nifty/operators/smooth_operator/smooth_operator.py
+++ b/nifty/operators/smoothing_operator/smoothing_operator.py
@@ -7,7 +7,7 @@ from nifty.operators.endomorphic_operator import EndomorphicOperator
 from nifty.operators.fft_operator import FFTOperator
 
 
-class SmoothOperator(EndomorphicOperator):
+class SmoothingOperator(EndomorphicOperator):
 
     # ---Overwritten properties and methods---
     def __init__(self, domain=(), field_type=(), sigma=None):