diff --git a/pystencils/cpu/kernelcreation.py b/pystencils/cpu/kernelcreation.py
index 9a5374d14be81cef7b49c4893a3b85e7d4566ea6..c84ed8d2b6764c4f67db7c8235fa1acfa3e63752 100644
--- a/pystencils/cpu/kernelcreation.py
+++ b/pystencils/cpu/kernelcreation.py
@@ -8,7 +8,7 @@ from pystencils.astnodes import Block, KernelFunction, LoopOverCoordinate, Sympy
 from pystencils.cpu.cpujit import make_python_function
 from pystencils.data_types import BasicType, StructType, TypedSymbol, create_type
 from pystencils.field import Field, FieldType
-from pystencils.optimizations import optims_pystencils_cpu, optimize_assignments
+from pystencils.math_optimizations import optims_pystencils_cpu, optimize_assignments
 from pystencils.transformations import (
     add_types, filtered_tree_iteration, get_base_buffer_index, get_optimal_loop_ordering,
     make_loop_over_domain, move_constants_before_loop, parse_base_pointer_info,
diff --git a/pystencils/gpucuda/kernelcreation.py b/pystencils/gpucuda/kernelcreation.py
index 849083363ead0dd9424fc88e67d570abe99fbe0a..3ac806e6cbc1838e2255b8cd12b057d238c0d5c8 100644
--- a/pystencils/gpucuda/kernelcreation.py
+++ b/pystencils/gpucuda/kernelcreation.py
@@ -3,7 +3,7 @@ from pystencils.data_types import BasicType, StructType, TypedSymbol
 from pystencils.field import Field, FieldType
 from pystencils.gpucuda.cudajit import make_python_function
 from pystencils.gpucuda.indexing import BlockIndexing
-from pystencils.optimizations import optims_pystencils_gpu, optimize_assignments
+from pystencils.math_optimizations import optims_pystencils_gpu, optimize_assignments
 from pystencils.transformations import (
     add_types, get_base_buffer_index, get_common_shape, parse_base_pointer_info,
     resolve_buffer_accesses, resolve_field_accesses, unify_shape_symbols)
diff --git a/pystencils/optimizations.py b/pystencils/math_optimizations.py
similarity index 100%
rename from pystencils/optimizations.py
rename to pystencils/math_optimizations.py
diff --git a/pystencils_tests/test_sympy_optimizations.py b/pystencils_tests/test_sympy_optimizations.py
index 3e5fd718e9224d8819488beaa37a2ae494ce911d..080205e3aecade863b26c1bd4c7227fe3e111c22 100644
--- a/pystencils_tests/test_sympy_optimizations.py
+++ b/pystencils_tests/test_sympy_optimizations.py
@@ -2,7 +2,7 @@ import pytest
 import sympy as sp
 
 import pystencils
-from pystencils.optimizations import HAS_REWRITING
+from pystencils.math_optimizations import HAS_REWRITING
 
 
 @pytest.mark.skipif(not HAS_REWRITING, reason="need sympy.codegen.rewriting")
@@ -38,8 +38,8 @@ def test_evaluate_constant_terms():
 
 @pytest.mark.skipif(not HAS_REWRITING, reason="need sympy.codegen.rewriting")
 def test_do_not_evaluate_constant_terms():
-    optimizations = pystencils.optimizations.optims_pystencils_cpu
-    optimizations.remove(pystencils.optimizations.evaluate_constant_terms)
+    optimizations = pystencils.math_optimizations.optims_pystencils_cpu
+    optimizations.remove(pystencils.math_optimizations.evaluate_constant_terms)
 
     for target in ('cpu', 'gpu'):
         x, y, z = pystencils.fields('x, y, z:  float32[2d]')