diff --git a/FppTest/state_machine/DeviceSm.cpp b/FppTest/state_machine/DeviceSm.cpp
index 0428956c5e..5fce5cf81c 100644
--- a/FppTest/state_machine/DeviceSm.cpp
+++ b/FppTest/state_machine/DeviceSm.cpp
@@ -21,7 +21,7 @@ void FppTest::DeviceSm::init(const FwEnumStoreType stateMachineId)
 void FppTest::DeviceSm::update(
     const FwEnumStoreType stateMachineId, 
     const DeviceSm_Interface::DeviceSm_Signals signal, 
-    const Fw::SMSignalBuffer &data
+    const Fw::SmSignalBuffer &data
 )
 {
     switch (this->state) {
diff --git a/FppTest/state_machine/DeviceSm.hpp b/FppTest/state_machine/DeviceSm.hpp
index bf8c6b0563..c9592b07fd 100644
--- a/FppTest/state_machine/DeviceSm.hpp
+++ b/FppTest/state_machine/DeviceSm.hpp
@@ -9,7 +9,7 @@
 #ifndef DEVICESM_H_
 #define DEVICESM_H_
                                 
-#include <Fw/Sm/SMSignalBuffer.hpp>
+#include <Fw/Sm/SmSignalBuffer.hpp>
 #include <config/FpConfig.hpp>
                                  
 namespace FppTest {
@@ -27,7 +27,7 @@ class DeviceSm_Interface {
     virtual bool DeviceSm_g2(
         const FwEnumStoreType stateMachineId, 
         const DeviceSm_Interface::DeviceSm_Signals signal, 
-        const Fw::SMSignalBuffer &data) = 0;
+        const Fw::SmSignalBuffer &data) = 0;
                                  
                                  
     virtual void DeviceSm_turnOff(const FwEnumStoreType stateMachineId) = 0;
@@ -36,7 +36,7 @@ class DeviceSm_Interface {
     virtual  void DeviceSm_a1(
         const FwEnumStoreType stateMachineId, 
         const DeviceSm_Interface::DeviceSm_Signals signal, 
-        const Fw::SMSignalBuffer &data) = 0;
+        const Fw::SmSignalBuffer &data) = 0;
                                  
                                  
     virtual void DeviceSm_turnOn(const FwEnumStoreType stateMachineId) = 0;
@@ -67,7 +67,7 @@ class DeviceSm {
     void update(
         const FwEnumStoreType stateMachineId, 
         const DeviceSm_Interface::DeviceSm_Signals signal, 
-        const Fw::SMSignalBuffer &data
+        const Fw::SmSignalBuffer &data
     );
 };
 
diff --git a/FppTest/state_machine/HackSm.cpp b/FppTest/state_machine/HackSm.cpp
index 94baf35d4f..6cf444f0ca 100644
--- a/FppTest/state_machine/HackSm.cpp
+++ b/FppTest/state_machine/HackSm.cpp
@@ -21,7 +21,7 @@ void FppTest::HackSm::init(const FwEnumStoreType stateMachineId)
 void FppTest::HackSm::update(
     const FwEnumStoreType stateMachineId, 
     const HackSm_Interface::HackSm_Signals signal, 
-    const Fw::SMSignalBuffer &data
+    const Fw::SmSignalBuffer &data
 )
 {
     switch (this->state) {
diff --git a/FppTest/state_machine/HackSm.hpp b/FppTest/state_machine/HackSm.hpp
index 2900ac8c16..7cfa698ad2 100644
--- a/FppTest/state_machine/HackSm.hpp
+++ b/FppTest/state_machine/HackSm.hpp
@@ -9,7 +9,7 @@
 #ifndef HACKSM_H_
 #define HACKSM_H_
                                 
-#include <Fw/Sm/SMSignalBuffer.hpp>
+#include <Fw/Sm/SmSignalBuffer.hpp>
 #include <config/FpConfig.hpp>
                                  
 namespace FppTest {
@@ -54,7 +54,7 @@ class HackSm {
     void update(
         const FwEnumStoreType stateMachineId, 
         const HackSm_Interface::HackSm_Signals signal, 
-        const Fw::SMSignalBuffer &data
+        const Fw::SmSignalBuffer &data
     );
 };
 
diff --git a/FppTest/state_machine/SmTest.cpp b/FppTest/state_machine/SmTest.cpp
index 5de48fe92b..41bc45e1c1 100644
--- a/FppTest/state_machine/SmTest.cpp
+++ b/FppTest/state_machine/SmTest.cpp
@@ -29,7 +29,7 @@ SmTest ::~SmTest() {}
 // ----------------------------------------------------------------------
 
 void SmTest::schedIn_handler(const NATIVE_INT_TYPE portNum, U32 context) {
-    Fw::SMSignalBuffer data;
+    Fw::SmSignalBuffer data;
 
     device1_stateMachineInvoke(DeviceSm_Interface::DeviceSm_Signals::RTI_SIG, data);
     device2_stateMachineInvoke(DeviceSm_Interface::DeviceSm_Signals::RTI_SIG, data);
@@ -42,7 +42,7 @@ void SmTest::schedIn_handler(const NATIVE_INT_TYPE portNum, U32 context) {
 //! Overflow hook for state machine device4
 void SmTest::device4_stateMachineOverflowHook(
     const HackSm_Interface::HackSm_Signals signal, //!< The state machine signal
-    const Fw::SMSignalBuffer& data //!< The state machine data
+    const Fw::SmSignalBuffer& data //!< The state machine data
 ) {
     
 }
@@ -58,7 +58,7 @@ void SmTest::DeviceSm_turnOff(const FwEnumStoreType stateMachineId) {
 void SmTest::DeviceSm_a1(
     const FwEnumStoreType stateMachineId, 
     const DeviceSm_Signals signal, 
-    const Fw::SMSignalBuffer& data
+    const Fw::SmSignalBuffer& data
     ) {
     printf("Action 1, stateMachineId = %d, signal = %d\n", stateMachineId, signal);
 }
@@ -71,7 +71,7 @@ void SmTest::DeviceSm_a1(
  bool SmTest::DeviceSm_g2(
       const FwEnumStoreType stateMachineId, 
       const DeviceSm_Signals signal, 
-      const Fw::SMSignalBuffer& data
+      const Fw::SmSignalBuffer& data
     ) {
         return true;
     }
diff --git a/FppTest/state_machine/SmTest.hpp b/FppTest/state_machine/SmTest.hpp
index 471f70aaf8..de68a75615 100644
--- a/FppTest/state_machine/SmTest.hpp
+++ b/FppTest/state_machine/SmTest.hpp
@@ -70,7 +70,7 @@ class SmTest :
     //! Overflow hook for state machine device4
     void device4_stateMachineOverflowHook(
         const HackSm_Interface::HackSm_Signals signal, //!< The state machine signal
-        const Fw::SMSignalBuffer& data //!< The state machine data
+        const Fw::SmSignalBuffer& data //!< The state machine data
     );
 
     // State machine functions
@@ -81,7 +81,7 @@ class SmTest :
     void DeviceSm_a1(
       const FwEnumStoreType stateMachineId, 
       const DeviceSm_Signals signal, 
-      const Fw::SMSignalBuffer& data
+      const Fw::SmSignalBuffer& data
     );
     
     void DeviceSm_a2(const FwEnumStoreType stateMachineId);
@@ -91,7 +91,7 @@ class SmTest :
     bool DeviceSm_g2(
       const FwEnumStoreType stateMachineId, 
       const DeviceSm_Signals signal, 
-      const Fw::SMSignalBuffer& data
+      const Fw::SmSignalBuffer& data
     );
 
     void HackSm_turnOn(const FwEnumStoreType stateMachineId);
diff --git a/FppTest/state_machine/test/ut/Tester.cpp b/FppTest/state_machine/test/ut/Tester.cpp
index cfb975cd00..7b763cc49f 100644
--- a/FppTest/state_machine/test/ut/Tester.cpp
+++ b/FppTest/state_machine/test/ut/Tester.cpp
@@ -51,7 +51,7 @@ void Tester::schedIn_OK() {
     ASSERT_EQ(DeviceSm::OFF, this->component.m_stateMachine_device4.state);
     ASSERT_EQ(DeviceSm::OFF, this->component.m_stateMachine_device5.state);
 
-    Fw::SMSignalBuffer data;
+    Fw::SmSignalBuffer data;
     this->component.device3_stateMachineInvoke(HackSm_Interface::HackSm_Signals::CHECK_SIG, data);
     dispatchAll();
     ASSERT_EQ(HackSm::DIAG, this->component.m_stateMachine_device3.state);
diff --git a/Fw/Sm/CMakeLists.txt b/Fw/Sm/CMakeLists.txt
index a87b038e60..2df8067315 100644
--- a/Fw/Sm/CMakeLists.txt
+++ b/Fw/Sm/CMakeLists.txt
@@ -6,6 +6,6 @@
 #
 ####
 set(SOURCE_FILES
-  "${CMAKE_CURRENT_LIST_DIR}/SMSignalBuffer.cpp"
+  "${CMAKE_CURRENT_LIST_DIR}/SmSignalBuffer.cpp"
 )
 register_fprime_module()
diff --git a/Fw/Sm/SMSignalBuffer.cpp b/Fw/Sm/SmSignalBuffer.cpp
similarity index 65%
rename from Fw/Sm/SMSignalBuffer.cpp
rename to Fw/Sm/SmSignalBuffer.cpp
index 14100bc002..c7394e1583 100644
--- a/Fw/Sm/SMSignalBuffer.cpp
+++ b/Fw/Sm/SmSignalBuffer.cpp
@@ -1,25 +1,25 @@
-#include <Fw/Sm/SMSignalBuffer.hpp>
+#include <Fw/Sm/SmSignalBuffer.hpp>
 #include <Fw/Types/Assert.hpp>
 
 namespace Fw {
 
-    SMSignalBuffer::SMSignalBuffer(const U8 *args, NATIVE_UINT_TYPE size) {
+    SmSignalBuffer::SmSignalBuffer(const U8 *args, NATIVE_UINT_TYPE size) {
         SerializeStatus stat = SerializeBufferBase::setBuff(args,size);
         FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<NATIVE_INT_TYPE>(stat));
     }
 
-    SMSignalBuffer::SMSignalBuffer() {
+    SmSignalBuffer::SmSignalBuffer() {
     }
 
-    SMSignalBuffer::~SMSignalBuffer() {
+    SmSignalBuffer::~SmSignalBuffer() {
     }
 
-    SMSignalBuffer::SMSignalBuffer(const SMSignalBuffer& other) : Fw::SerializeBufferBase() {
+    SmSignalBuffer::SmSignalBuffer(const SmSignalBuffer& other) : Fw::SerializeBufferBase() {
         SerializeStatus stat = SerializeBufferBase::setBuff(other.m_bufferData,other.getBuffLength());
         FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<NATIVE_INT_TYPE>(stat));
     }
 
-    SMSignalBuffer& SMSignalBuffer::operator=(const SMSignalBuffer& other) {
+    SmSignalBuffer& SmSignalBuffer::operator=(const SmSignalBuffer& other) {
         if(this == &other) {
             return *this;
         }
@@ -29,15 +29,15 @@ namespace Fw {
         return *this;
     }
 
-    NATIVE_UINT_TYPE SMSignalBuffer::getBuffCapacity() const {
+    NATIVE_UINT_TYPE SmSignalBuffer::getBuffCapacity() const {
         return sizeof(this->m_bufferData);
     }
 
-    const U8* SMSignalBuffer::getBuffAddr() const {
+    const U8* SmSignalBuffer::getBuffAddr() const {
         return this->m_bufferData;
     }
 
-    U8* SMSignalBuffer::getBuffAddr() {
+    U8* SmSignalBuffer::getBuffAddr() {
         return this->m_bufferData;
     }
 
diff --git a/Fw/Sm/SMSignalBuffer.hpp b/Fw/Sm/SmSignalBuffer.hpp
similarity index 65%
rename from Fw/Sm/SMSignalBuffer.hpp
rename to Fw/Sm/SmSignalBuffer.hpp
index 931ae46843..62f48c9d4a 100644
--- a/Fw/Sm/SMSignalBuffer.hpp
+++ b/Fw/Sm/SmSignalBuffer.hpp
@@ -1,11 +1,11 @@
 /*
- * SMSignalBuffer.hpp
+ * SmSignalBuffer.hpp
  *
  */
 
 /*
  * Description:
- * This object contains the SMSignalBuffer type, used for attaching data to state machine signals
+ * This object contains the SmSignalBuffer type, used for attaching data to state machine signals
  */
 #ifndef FW_SM_SIGNAL_BUFFER_HPP
 #define FW_SM_SIGNAL_BUFFER_HPP
@@ -15,7 +15,7 @@
 
 namespace Fw {
 
-    class SMSignalBuffer : public SerializeBufferBase {
+    class SmSignalBuffer : public SerializeBufferBase {
         public:
 
             enum {
@@ -23,11 +23,11 @@ namespace Fw {
                 SERIALIZED_SIZE = FW_COM_BUFFER_MAX_SIZE + sizeof(FwBuffSizeType)  // size of buffer + storage of size word
             };
 
-            SMSignalBuffer(const U8 *args, NATIVE_UINT_TYPE size);
-            SMSignalBuffer();
-            SMSignalBuffer(const SMSignalBuffer& other);
-            virtual ~SMSignalBuffer();
-            SMSignalBuffer& operator=(const SMSignalBuffer& other);
+            SmSignalBuffer(const U8 *args, NATIVE_UINT_TYPE size);
+            SmSignalBuffer();
+            SmSignalBuffer(const SmSignalBuffer& other);
+            virtual ~SmSignalBuffer();
+            SmSignalBuffer& operator=(const SmSignalBuffer& other);
 
             NATIVE_UINT_TYPE getBuffCapacity() const; // !< returns capacity, not current size, of buffer
             U8* getBuffAddr();