diff --git a/pyinfra/server/processor/__init__.py b/pyinfra/server/bufferizer/__init__.py
similarity index 100%
rename from pyinfra/server/processor/__init__.py
rename to pyinfra/server/bufferizer/__init__.py
diff --git a/pyinfra/server/processor/buffer.py b/pyinfra/server/bufferizer/buffer.py
similarity index 100%
rename from pyinfra/server/processor/buffer.py
rename to pyinfra/server/bufferizer/buffer.py
diff --git a/pyinfra/server/processor/lazy_bufferizer.py b/pyinfra/server/bufferizer/lazy_bufferizer.py
similarity index 95%
rename from pyinfra/server/processor/lazy_bufferizer.py
rename to pyinfra/server/bufferizer/lazy_bufferizer.py
index be11701..96a677d 100644
--- a/pyinfra/server/processor/lazy_bufferizer.py
+++ b/pyinfra/server/bufferizer/lazy_bufferizer.py
@@ -5,7 +5,7 @@ from typing import Union, Any
 from funcy import flatten, compose
 
 from pyinfra.server.dispatcher.dispatcher import Nothing
-from pyinfra.server.processor.buffer import bufferize
+from pyinfra.server.bufferizer.buffer import bufferize
 from pyinfra.utils.func import lift
 
 logger = logging.getLogger(__name__)
diff --git a/pyinfra/server/server.py b/pyinfra/server/server.py
index d684525..45d7c87 100644
--- a/pyinfra/server/server.py
+++ b/pyinfra/server/server.py
@@ -5,7 +5,7 @@ from flask import Flask, jsonify, request
 from funcy import rcompose, compose, first, chunks, flatten
 
 from pyinfra.server.dispatcher.dispatcher import Nothing
-from pyinfra.server.processor.lazy_bufferizer import LazyBufferizer
+from pyinfra.server.bufferizer.lazy_bufferizer import LazyBufferizer
 from pyinfra.server.utils import unpack, normalize, pack
 from pyinfra.utils.func import starlift, lift
 
diff --git a/test/unit_tests/server/buffer_test.py b/test/unit_tests/server/buffer_test.py
index 66fd186..732967c 100644
--- a/test/unit_tests/server/buffer_test.py
+++ b/test/unit_tests/server/buffer_test.py
@@ -1,7 +1,7 @@
 from funcy import compose, lmapcat, compact, flatten
 
 from pyinfra.server.dispatcher.dispatcher import Nothing
-from pyinfra.server.processor.buffer import bufferize
+from pyinfra.server.bufferizer.buffer import bufferize
 
 
 def test_buffer():
diff --git a/test/unit_tests/server/lazy_bufferizer_test.py b/test/unit_tests/server/lazy_bufferizer_test.py
index e035172..225eb68 100644
--- a/test/unit_tests/server/lazy_bufferizer_test.py
+++ b/test/unit_tests/server/lazy_bufferizer_test.py
@@ -4,7 +4,7 @@ import pytest
 from funcy import repeatedly
 
 from pyinfra.server.dispatcher.dispatcher import Nothing
-from pyinfra.server.processor.lazy_bufferizer import LazyBufferizer
+from pyinfra.server.bufferizer.lazy_bufferizer import LazyBufferizer
 from pyinfra.utils.func import lift