diff --git a/Svc/FprimeDeframer/FprimeDeframer.hpp b/Svc/FprimeDeframer/FprimeDeframer.hpp
index 6d74d7a3563..1d1d5b9ebdf 100644
--- a/Svc/FprimeDeframer/FprimeDeframer.hpp
+++ b/Svc/FprimeDeframer/FprimeDeframer.hpp
@@ -27,14 +27,14 @@ class FprimeDeframer final : public FprimeDeframerComponentBase {
     //! Destroy FprimeDeframer object
     ~FprimeDeframer();
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------
 
     //! Handler implementation for frame
     //!
-    //! Port to receive framed data. The handler will strip the header and trailer from the frame 
+    //! Port to receive framed data. The handler will strip the header and trailer from the frame
     //! and pass the deframed data to the deframed output port.
     void dataIn_handler(FwIndexType portNum,  //!< The port number
                        Fw::Buffer& data,
diff --git a/Svc/FprimeFramer/FprimeFramer.hpp b/Svc/FprimeFramer/FprimeFramer.hpp
index e501d5cefa4..760bcb5f986 100644
--- a/Svc/FprimeFramer/FprimeFramer.hpp
+++ b/Svc/FprimeFramer/FprimeFramer.hpp
@@ -24,7 +24,7 @@ class FprimeFramer final : public FprimeFramerComponentBase {
     //! Destroy FprimeFramer object
     ~FprimeFramer();
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for typed input ports
     // ----------------------------------------------------------------------
diff --git a/Svc/FprimeRouter/FprimeRouter.hpp b/Svc/FprimeRouter/FprimeRouter.hpp
index 6a21bb8369e..72f475bbf61 100644
--- a/Svc/FprimeRouter/FprimeRouter.hpp
+++ b/Svc/FprimeRouter/FprimeRouter.hpp
@@ -24,7 +24,7 @@ class FprimeRouter final : public FprimeRouterComponentBase {
     //! Destroy FprimeRouter object
     ~FprimeRouter();
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------
diff --git a/Svc/FrameAccumulator/FrameAccumulator.hpp b/Svc/FrameAccumulator/FrameAccumulator.hpp
index a6bd4128a40..648517cbd1f 100644
--- a/Svc/FrameAccumulator/FrameAccumulator.hpp
+++ b/Svc/FrameAccumulator/FrameAccumulator.hpp
@@ -15,6 +15,9 @@
 namespace Svc {
 
 class FrameAccumulator final : public FrameAccumulatorComponentBase {
+
+  friend class FrameAccumulatorTester;
+
   public:
     // ----------------------------------------------------------------------
     // Component construction and destruction
@@ -41,7 +44,7 @@ class FrameAccumulator final : public FrameAccumulatorComponentBase {
     void cleanup();
 
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------
@@ -58,10 +61,10 @@ class FrameAccumulator final : public FrameAccumulatorComponentBase {
     //! Port receiving ownership back of buffers sent on dataOut
     void dataReturnIn_handler(FwIndexType portNum,  //!< The port number
                                 Fw::Buffer& fwBuffer,  //!< The buffer
-                                const ComCfg::FrameContext& context  //!< The context object  
+                                const ComCfg::FrameContext& context  //!< The context object
                               ) override;
 
-  PRIVATE:
+  private:
     //! \brief process raw buffer
     //! \return raw data buffer
     void processBuffer(Fw::Buffer& buffer);
diff --git a/Svc/FramingProtocol/DeframingProtocol.hpp b/Svc/FramingProtocol/DeframingProtocol.hpp
index 6bb4e107811..5fcfbd7cb65 100644
--- a/Svc/FramingProtocol/DeframingProtocol.hpp
+++ b/Svc/FramingProtocol/DeframingProtocol.hpp
@@ -59,7 +59,7 @@ class DeframingProtocol {
                                     U32& needed  /*!< Return needed number of bytes */
     ) = 0;
 
-  PROTECTED:
+  protected:
     DeframingProtocolInterface* m_interface;
 };
 }
diff --git a/Svc/FramingProtocol/FramingProtocol.hpp b/Svc/FramingProtocol/FramingProtocol.hpp
index c2deb12c403..270f9cf9d49 100644
--- a/Svc/FramingProtocol/FramingProtocol.hpp
+++ b/Svc/FramingProtocol/FramingProtocol.hpp
@@ -45,7 +45,7 @@ class FramingProtocol {
     //! \param packet_type: type of data supplied for File downlink packets
     virtual void frame(const U8* const data, const U32 size, Fw::ComPacket::ComPacketType packet_type) = 0;
 
-  PROTECTED:
+  protected:
     FramingProtocolInterface* m_interface;
 };
 }