diff --git a/include/user/stimulusBuffer.h b/include/user/stimulusBuffer.h
index 9158525..ab991af 100644
--- a/include/user/stimulusBuffer.h
+++ b/include/user/stimulusBuffer.h
@@ -15,7 +15,7 @@
 #include <spinLock.h>
 #include <asynchronousBridge.h>
 #include <user/spMcRingBuffer.h>
-#include "stimFrame.h"
+#include "stimulusFrame.h"
 #include "deviceAttachmentSpec.h"
 
 namespace smo {
@@ -97,7 +97,7 @@ private:
 
 public:
 	std::shared_ptr<device::DeviceAttachmentSpec> deviceAttachmentSpec;
-	std::vector<StimFrame> frames_;
+	std::vector<StimulusFrame> frames_;
 
 protected:
 	SpinLock frameAssemblyRateLimiter;
diff --git a/include/user/stimFrame.h b/include/user/stimulusFrame.h
similarity index 95%
rename from include/user/stimFrame.h
rename to include/user/stimulusFrame.h
index db6e5ec..39f9606 100644
--- a/include/user/stimFrame.h
+++ b/include/user/stimulusFrame.h
@@ -1,5 +1,5 @@
-#ifndef _STIM_FRAME_H
-#define _STIM_FRAME_H
+#ifndef _ATTACHMENT_SUPPORT_STIMULUS_FRAME_H
+#define _ATTACHMENT_SUPPORT_STIMULUS_FRAME_H
 
 #include <cstdint>
 
@@ -58,7 +58,7 @@ namespace stim_buff {
  */
 typedef uint64_t SimultaneityStamp;
 
-class StimFrame
+class StimulusFrame
 {
 public:
 	SimultaneityStamp simultaneityStamp;
@@ -67,4 +67,4 @@ public:
 } // namespace stim_buff
 } // namespace smo
 
-#endif // _STIM_FRAME_H
+#endif // _ATTACHMENT_SUPPORT_STIMULUS_FRAME_H
diff --git a/stimBuffApis/livoxGen1/pcloudStimulusBuffer.h b/stimBuffApis/livoxGen1/pcloudStimulusBuffer.h
index c6d4423..fafc0d1 100644
--- a/stimBuffApis/livoxGen1/pcloudStimulusBuffer.h
+++ b/stimBuffApis/livoxGen1/pcloudStimulusBuffer.h
@@ -3,7 +3,6 @@
 
 #include <functional>
 #include <user/stimulusBuffer.h>
-#include <user/stimFrame.h>
 #include <livoxProto1/device.h>
 #include <asynchronousContinuation.h>
 #include <callback.h>