diff --git a/stimBuffApis/livoxGen1/CMakeLists.txt b/stimBuffApis/livoxGen1/CMakeLists.txt
index e1ad253..93a56b6 100644
--- a/stimBuffApis/livoxGen1/CMakeLists.txt
+++ b/stimBuffApis/livoxGen1/CMakeLists.txt
@@ -42,7 +42,7 @@ if(ENABLE_STIMBUFFAPI_livoxGen1)
 		stagingBuffer.cpp
 		pcloudStimulusBuffer.cpp
 		ioUringAssemblyEngine.cpp
-		openClSplittingEngine.cpp
+		openClCollatingAndMeshingEngine.cpp
 	)
 
 	target_include_directories(livoxGen1 PUBLIC
diff --git a/stimBuffApis/livoxGen1/openClSplittingEngine.cpp b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
similarity index 88%
rename from stimBuffApis/livoxGen1/openClSplittingEngine.cpp
rename to stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
index 26c3456..ea9efc9 100644
--- a/stimBuffApis/livoxGen1/openClSplittingEngine.cpp
+++ b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
@@ -1,13 +1,13 @@
 #include <stdexcept>
 #include <iostream>
 #include <cstring>
-#include "openClSplittingEngine.h"
+#include "openClCollatingAndMeshingEngine.h"
 #include "pcloudStimulusBuffer.h"
 
 namespace smo {
 namespace stim_buff {
 
-OpenClSplittingEngine::OpenClSplittingEngine(PcloudStimulusBuffer& parent_)
+OpenClCollatingAndMeshingEngine::OpenClCollatingAndMeshingEngine(PcloudStimulusBuffer& parent_)
 : parent(parent_),
 platform(nullptr),
 device(nullptr),
@@ -22,12 +22,12 @@ intensityBuffer(nullptr)
 {
 }
 
-OpenClSplittingEngine::~OpenClSplittingEngine()
+OpenClCollatingAndMeshingEngine::~OpenClCollatingAndMeshingEngine()
 {
 	finalize();
 }
 
-bool OpenClSplittingEngine::setup()
+bool OpenClCollatingAndMeshingEngine::setup()
 {
 	if (isSetup) {
 		return true;
@@ -81,7 +81,7 @@ cleanup:
 	return false;
 }
 
-void OpenClSplittingEngine::finalize()
+void OpenClCollatingAndMeshingEngine::finalize()
 {
 	if (intensityBuffer) {
 		clReleaseMemObject(intensityBuffer);
@@ -119,3 +119,4 @@ void OpenClSplittingEngine::finalize()
 
 } // namespace stim_buff
 } // namespace smo
+
diff --git a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.h b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.h
new file mode 100644
index 0000000..9e6bc68
--- /dev/null
+++ b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.h
@@ -0,0 +1,56 @@
+#ifndef _LIVOX_GEN1_OPENCL_COLLATING_AND_MESHING_ENGINE_H
+#define _LIVOX_GEN1_OPENCL_COLLATING_AND_MESHING_ENGINE_H
+
+#include <cstdint>
+#include <cstddef>
+#include <memory>
+#define CL_TARGET_OPENCL_VERSION 300
+#include <CL/cl.h>
+
+namespace smo {
+namespace stim_buff {
+
+class PcloudStimulusBuffer;
+
+class OpenClCollatingAndMeshingEngine
+{
+public:
+	explicit OpenClCollatingAndMeshingEngine(PcloudStimulusBuffer& parent);
+	~OpenClCollatingAndMeshingEngine();
+
+	// Non-copyable, movable
+	OpenClCollatingAndMeshingEngine(
+		const OpenClCollatingAndMeshingEngine&) = delete;
+	OpenClCollatingAndMeshingEngine& operator=(
+		const OpenClCollatingAndMeshingEngine&) = delete;
+	OpenClCollatingAndMeshingEngine(
+		OpenClCollatingAndMeshingEngine&&) = default;
+	OpenClCollatingAndMeshingEngine& operator=(
+		OpenClCollatingAndMeshingEngine&&) = default;
+
+	bool setup();
+	void finalize();
+
+private:
+	PcloudStimulusBuffer& parent;
+
+	// OpenCL infrastructure
+	cl_platform_id platform;
+	cl_device_id device;
+	cl_context context;
+	cl_command_queue commandQueue;
+	cl_program program;
+	cl_kernel kernel;
+	bool isSetup;
+
+	// OpenCL buffers
+	cl_mem assemblyBuffer;
+	cl_mem xyzBuffer;
+	cl_mem intensityBuffer;
+};
+
+} // namespace stim_buff
+} // namespace smo
+
+#endif // _LIVOX_GEN1_OPENCL_COLLATING_AND_MESHING_ENGINE_H
+
diff --git a/stimBuffApis/livoxGen1/openClSplittingEngine.h b/stimBuffApis/livoxGen1/openClSplittingEngine.h
deleted file mode 100644
index ca71c9a..0000000
--- a/stimBuffApis/livoxGen1/openClSplittingEngine.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _LIVOX_GEN1_OPENCL_SPLITTING_ENGINE_H
-#define _LIVOX_GEN1_OPENCL_SPLITTING_ENGINE_H
-
-#include <cstdint>
-#include <cstddef>
-#include <memory>
-#define CL_TARGET_OPENCL_VERSION 300
-#include <CL/cl.h>
-
-namespace smo {
-namespace stim_buff {
-
-class PcloudStimulusBuffer;
-
-class OpenClSplittingEngine
-{
-public:
-	explicit OpenClSplittingEngine(PcloudStimulusBuffer& parent);
-	~OpenClSplittingEngine();
-
-	// Non-copyable, movable
-	OpenClSplittingEngine(const OpenClSplittingEngine&) = delete;
-	OpenClSplittingEngine& operator=(const OpenClSplittingEngine&) = delete;
-	OpenClSplittingEngine(OpenClSplittingEngine&&) = default;
-	OpenClSplittingEngine& operator=(OpenClSplittingEngine&&) = default;
-
-	bool setup();
-	void finalize();
-
-private:
-	PcloudStimulusBuffer& parent;
-
-	// OpenCL infrastructure
-	cl_platform_id platform;
-	cl_device_id device;
-	cl_context context;
-	cl_command_queue commandQueue;
-	cl_program program;
-	cl_kernel kernel;
-	bool isSetup;
-
-	// OpenCL buffers
-	cl_mem assemblyBuffer;
-	cl_mem xyzBuffer;
-	cl_mem intensityBuffer;
-};
-
-} // namespace stim_buff
-} // namespace smo
-
-#endif // _LIVOX_GEN1_OPENCL_SPLITTING_ENGINE_H