diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
index 49a38da6c..e73122c64 100644
--- a/src/wifi/model/ap-wifi-mac.cc
+++ b/src/wifi/model/ap-wifi-mac.cc
@@ -479,24 +479,24 @@ ApWifiMac::GetEdcaParameterSet (void) const
   return edcaParameters;
 }
 
-HtOperations
-ApWifiMac::GetHtOperations (void) const
+HtOperation
+ApWifiMac::GetHtOperation (void) const
 {
-  HtOperations operations;
-  operations.SetHtSupported (1);
+  HtOperation operation;
+  operation.SetHtSupported (1);
   if (m_htSupported)
     {
-      operations.SetNonGfHtStasPresent (IsNonGfHtStasPresent ());
+      operation.SetNonGfHtStasPresent (IsNonGfHtStasPresent ());
       if (m_nonHtStations.empty ())
         {
-          operations.SetHtProtection (NO_PROTECTION);
+          operation.SetHtProtection (NO_PROTECTION);
         }
       else
         {
-          operations.SetHtProtection (MIXED_MODE_PROTECTION);
+          operation.SetHtProtection (MIXED_MODE_PROTECTION);
         }
     }
-  return operations;
+  return operation;
 }
 
 void
@@ -533,7 +533,7 @@ ApWifiMac::SendProbeResp (Mac48Address to)
   if (m_htSupported || m_vhtSupported)
     {
       probe.SetHtCapabilities (GetHtCapabilities ());
-      probe.SetHtOperations (GetHtOperations ());
+      probe.SetHtOperation (GetHtOperation ());
       hdr.SetNoOrder ();
     }
   if (m_vhtSupported)
@@ -586,7 +586,7 @@ ApWifiMac::SendAssocResp (Mac48Address to, bool success)
   if (m_htSupported || m_vhtSupported)
     {
       assoc.SetHtCapabilities (GetHtCapabilities ());
-      assoc.SetHtOperations (GetHtOperations ());
+      assoc.SetHtOperation (GetHtOperation ());
       hdr.SetNoOrder ();
     }
   if (m_vhtSupported)
@@ -636,7 +636,7 @@ ApWifiMac::SendOneBeacon (void)
   if (m_htSupported || m_vhtSupported)
     {
       beacon.SetHtCapabilities (GetHtCapabilities ());
-      beacon.SetHtOperations (GetHtOperations ());
+      beacon.SetHtOperation (GetHtOperation ());
       hdr.SetNoOrder ();
     }
   if (m_vhtSupported)
diff --git a/src/wifi/model/ap-wifi-mac.h b/src/wifi/model/ap-wifi-mac.h
index 1bb44be0d..3933aaffa 100644
--- a/src/wifi/model/ap-wifi-mac.h
+++ b/src/wifi/model/ap-wifi-mac.h
@@ -25,7 +25,7 @@
 
 #include "regular-wifi-mac.h"
 #include "capability-information.h"
-#include "ht-operations.h"
+#include "ht-operation.h"
 #include "supported-rates.h"
 #include "dsss-parameter-set.h"
 #include "erp-information.h"
@@ -219,11 +219,11 @@ private:
    */
   EdcaParameterSet GetEdcaParameterSet (void) const;
   /**
-   * Return the HT operations of the current AP.
+   * Return the HT operation of the current AP.
    *
-   * \return the HT operations that we support
+   * \return the HT operation that we support
    */
-  HtOperations GetHtOperations (void) const;
+  HtOperation GetHtOperation (void) const;
   /**
    * Return an instance of SupportedRates that contains all rates that we support
    * including HT rates.
diff --git a/src/wifi/model/ht-operations.cc b/src/wifi/model/ht-operation.cc
similarity index 70%
rename from src/wifi/model/ht-operations.cc
rename to src/wifi/model/ht-operation.cc
index 0d3ddd6be..a633d0cbe 100644
--- a/src/wifi/model/ht-operations.cc
+++ b/src/wifi/model/ht-operation.cc
@@ -18,14 +18,14 @@
  * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
  */
 
-#include "ht-operations.h"
+#include "ht-operation.h"
 #include "ns3/log.h"
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("HtOperations");
+NS_LOG_COMPONENT_DEFINE ("HtOperation");
 
-HtOperations::HtOperations ()
+HtOperation::HtOperation ()
   : m_primaryChannel (0),
     m_secondaryChannelOffset (0),
     m_staChannelWidth (0),
@@ -61,19 +61,19 @@ HtOperations::HtOperations ()
 }
 
 WifiInformationElementId
-HtOperations::ElementId () const
+HtOperation::ElementId () const
 {
-  return IE_HT_OPERATIONS;
+  return IE_HT_OPERATION;
 }
 
 void
-HtOperations::SetHtSupported (uint8_t htsupported)
+HtOperation::SetHtSupported (uint8_t htsupported)
 {
   m_htSupported = htsupported;
 }
 
 uint8_t
-HtOperations::GetInformationFieldSize () const
+HtOperation::GetInformationFieldSize () const
 {
   //we should not be here if ht is not supported
   NS_ASSERT (m_htSupported > 0);
@@ -81,199 +81,199 @@ HtOperations::GetInformationFieldSize () const
 }
 
 void
-HtOperations::SetPrimaryChannel (uint8_t ctrl)
+HtOperation::SetPrimaryChannel (uint8_t ctrl)
 {
   m_primaryChannel = ctrl;
 }
 
 void
-HtOperations::SetSecondaryChannelOffset (uint8_t secondarychanneloffset)
+HtOperation::SetSecondaryChannelOffset (uint8_t secondarychanneloffset)
 {
   m_secondaryChannelOffset = secondarychanneloffset;
 }
 
 void
-HtOperations::SetStaChannelWidth (uint8_t stachannelwidth)
+HtOperation::SetStaChannelWidth (uint8_t stachannelwidth)
 {
   m_staChannelWidth = stachannelwidth;
 }
 
 void
-HtOperations::SetRifsMode (uint8_t rifsmode)
+HtOperation::SetRifsMode (uint8_t rifsmode)
 {
   m_rifsMode = rifsmode;
 }
 
 void
-HtOperations::SetHtProtection (uint8_t htprotection)
+HtOperation::SetHtProtection (uint8_t htprotection)
 {
   m_htProtection = htprotection;
 }
 
 void
-HtOperations::SetNonGfHtStasPresent (uint8_t nongfhtstaspresent)
+HtOperation::SetNonGfHtStasPresent (uint8_t nongfhtstaspresent)
 {
   m_nonGfHtStasPresent = nongfhtstaspresent;
 }
 
 void
-HtOperations::SetObssNonHtStasPresent (uint8_t obssnonhtstaspresent)
+HtOperation::SetObssNonHtStasPresent (uint8_t obssnonhtstaspresent)
 {
   m_obssNonHtStasPresent = obssnonhtstaspresent;
 }
 
 void
-HtOperations::SetDualBeacon (uint8_t dualbeacon)
+HtOperation::SetDualBeacon (uint8_t dualbeacon)
 {
   m_dualBeacon = dualbeacon;
 }
 
 void
-HtOperations::SetDualCtsProtection (uint8_t dualctsprotection)
+HtOperation::SetDualCtsProtection (uint8_t dualctsprotection)
 {
   m_dualCtsProtection = dualctsprotection;
 }
 
 void
-HtOperations::SetStbcBeacon (uint8_t stbcbeacon)
+HtOperation::SetStbcBeacon (uint8_t stbcbeacon)
 {
   m_stbcBeacon = stbcbeacon;
 }
 
 void
-HtOperations::SetLSigTxopProtectionFullSupport (uint8_t lsigtxopprotectionfullsupport)
+HtOperation::SetLSigTxopProtectionFullSupport (uint8_t lsigtxopprotectionfullsupport)
 {
   m_lSigTxopProtectionFullSupport = lsigtxopprotectionfullsupport;
 }
 
 void
-HtOperations::SetPcoActive (uint8_t pcoactive)
+HtOperation::SetPcoActive (uint8_t pcoactive)
 {
   m_pcoActive = pcoactive;
 }
 
 void
-HtOperations::SetPhase (uint8_t pcophase)
+HtOperation::SetPhase (uint8_t pcophase)
 {
   m_pcoPhase = pcophase;
 }
 
 void
-HtOperations::SetRxMcsBitmask (uint8_t index)
+HtOperation::SetRxMcsBitmask (uint8_t index)
 {
   m_rxMcsBitmask[index] = 1;
 }
 
 void
-HtOperations::SetRxHighestSupportedDataRate (uint16_t maxsupportedrate)
+HtOperation::SetRxHighestSupportedDataRate (uint16_t maxsupportedrate)
 {
   m_rxHighestSupportedDataRate = maxsupportedrate;
 }
 
 void
-HtOperations::SetTxMcsSetDefined (uint8_t txmcssetdefined)
+HtOperation::SetTxMcsSetDefined (uint8_t txmcssetdefined)
 {
   m_txMcsSetDefined = txmcssetdefined;
 }
 
 void
-HtOperations::SetTxRxMcsSetUnequal (uint8_t txrxmcssetunequal)
+HtOperation::SetTxRxMcsSetUnequal (uint8_t txrxmcssetunequal)
 {
   m_txRxMcsSetUnequal = txrxmcssetunequal;
 }
 
 void
-HtOperations::SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams)
+HtOperation::SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams)
 {
   m_txMaxNSpatialStreams = maxtxspatialstreams;
 }
 
 void
-HtOperations::SetTxUnequalModulation (uint8_t txunequalmodulation)
+HtOperation::SetTxUnequalModulation (uint8_t txunequalmodulation)
 {
   m_txUnequalModulation = txunequalmodulation;
 }
 
 uint8_t
-HtOperations::GetPrimaryChannel (void) const
+HtOperation::GetPrimaryChannel (void) const
 {
   return m_primaryChannel;
 }
 
 uint8_t
-HtOperations::GetSecondaryChannelOffset (void) const
+HtOperation::GetSecondaryChannelOffset (void) const
 {
   return m_secondaryChannelOffset;
 }
 
 uint8_t
-HtOperations::GetStaChannelWidth (void) const
+HtOperation::GetStaChannelWidth (void) const
 {
   return m_staChannelWidth;
 }
 
 uint8_t
-HtOperations::GetRifsMode (void) const
+HtOperation::GetRifsMode (void) const
 {
   return m_rifsMode;
 }
 
 uint8_t
-HtOperations::GetHtProtection (void) const
+HtOperation::GetHtProtection (void) const
 {
   return m_htProtection;
 }
 
 uint8_t
-HtOperations::GetNonGfHtStasPresent (void) const
+HtOperation::GetNonGfHtStasPresent (void) const
 {
   return m_nonGfHtStasPresent;
 }
 
 uint8_t
-HtOperations::GetObssNonHtStasPresent (void) const
+HtOperation::GetObssNonHtStasPresent (void) const
 {
   return m_obssNonHtStasPresent;
 }
 
 uint8_t
-HtOperations::GetDualBeacon (void) const
+HtOperation::GetDualBeacon (void) const
 {
   return m_dualBeacon;
 }
 
 uint8_t
-HtOperations::GetDualCtsProtection (void) const
+HtOperation::GetDualCtsProtection (void) const
 {
   return m_dualCtsProtection;
 }
 
 uint8_t
-HtOperations::GetStbcBeacon (void) const
+HtOperation::GetStbcBeacon (void) const
 {
   return m_stbcBeacon;
 }
 
 uint8_t
-HtOperations::GetLSigTxopProtectionFullSupport (void) const
+HtOperation::GetLSigTxopProtectionFullSupport (void) const
 {
   return m_lSigTxopProtectionFullSupport;
 }
 
 uint8_t
-HtOperations::GetPcoActive (void) const
+HtOperation::GetPcoActive (void) const
 {
   return m_pcoActive;
 }
 
 uint8_t
-HtOperations::GetPhase (void) const
+HtOperation::GetPhase (void) const
 {
   return m_pcoPhase;
 }
 
 bool
-HtOperations::IsSupportedMcs (uint8_t mcs)
+HtOperation::IsSupportedMcs (uint8_t mcs)
 {
   if (m_rxMcsBitmask[mcs] == 1)
     {
@@ -283,37 +283,37 @@ HtOperations::IsSupportedMcs (uint8_t mcs)
 }
 
 uint16_t
-HtOperations::GetRxHighestSupportedDataRate (void) const
+HtOperation::GetRxHighestSupportedDataRate (void) const
 {
   return m_rxHighestSupportedDataRate;
 }
 
 uint8_t
-HtOperations::GetTxMcsSetDefined (void) const
+HtOperation::GetTxMcsSetDefined (void) const
 {
   return m_txMcsSetDefined;
 }
 
 uint8_t
-HtOperations::GetTxRxMcsSetUnequal (void) const
+HtOperation::GetTxRxMcsSetUnequal (void) const
 {
   return m_txRxMcsSetUnequal;
 }
 
 uint8_t
-HtOperations::GetTxMaxNSpatialStreams (void) const
+HtOperation::GetTxMaxNSpatialStreams (void) const
 {
   return m_txMaxNSpatialStreams;
 }
 
 uint8_t
-HtOperations::GetTxUnequalModulation (void) const
+HtOperation::GetTxUnequalModulation (void) const
 {
   return m_txUnequalModulation;
 }
 
 Buffer::Iterator
-HtOperations::Serialize (Buffer::Iterator i) const
+HtOperation::Serialize (Buffer::Iterator i) const
 {
   if (m_htSupported < 1)
     {
@@ -323,7 +323,7 @@ HtOperations::Serialize (Buffer::Iterator i) const
 }
 
 uint16_t
-HtOperations::GetSerializedSize () const
+HtOperation::GetSerializedSize () const
 {
   if (m_htSupported < 1)
     {
@@ -333,7 +333,7 @@ HtOperations::GetSerializedSize () const
 }
 
 uint8_t
-HtOperations::GetInformationSubset1 (void) const
+HtOperation::GetInformationSubset1 (void) const
 {
   uint16_t val = 0;
   val |= m_secondaryChannelOffset & 0x03;
@@ -344,7 +344,7 @@ HtOperations::GetInformationSubset1 (void) const
 }
 
 void
-HtOperations::SetInformationSubset1 (uint8_t ctrl)
+HtOperation::SetInformationSubset1 (uint8_t ctrl)
 {
   m_secondaryChannelOffset = ctrl & 0x03;
   m_staChannelWidth = (ctrl >> 2) & 0x01;
@@ -353,7 +353,7 @@ HtOperations::SetInformationSubset1 (uint8_t ctrl)
 }
 
 uint16_t
-HtOperations::GetInformationSubset2 (void) const
+HtOperation::GetInformationSubset2 (void) const
 {
   uint16_t val = 0;
   val |= m_htProtection & 0x03;
@@ -365,7 +365,7 @@ HtOperations::GetInformationSubset2 (void) const
 }
 
 void
-HtOperations::SetInformationSubset2 (uint16_t ctrl)
+HtOperation::SetInformationSubset2 (uint16_t ctrl)
 {
   m_htProtection = ctrl & 0x03;
   m_nonGfHtStasPresent = (ctrl >> 2) & 0x01;
@@ -375,7 +375,7 @@ HtOperations::SetInformationSubset2 (uint16_t ctrl)
 }
 
 uint16_t
-HtOperations::GetInformationSubset3 (void) const
+HtOperation::GetInformationSubset3 (void) const
 {
   uint16_t val = 0;
   val |= m_reservedInformationSubset3_1 & 0x3f;
@@ -390,7 +390,7 @@ HtOperations::GetInformationSubset3 (void) const
 }
 
 void
-HtOperations::SetInformationSubset3 (uint16_t ctrl)
+HtOperation::SetInformationSubset3 (uint16_t ctrl)
 {
   m_reservedInformationSubset3_1 = ctrl & 0x3f;
   m_dualBeacon = (ctrl >> 6) & 0x01;
@@ -403,7 +403,7 @@ HtOperations::SetInformationSubset3 (uint16_t ctrl)
 }
 
 void
-HtOperations::SetBasicMcsSet (uint64_t ctrl1, uint64_t ctrl2)
+HtOperation::SetBasicMcsSet (uint64_t ctrl1, uint64_t ctrl2)
 {
   for (uint64_t i = 0; i < 77; i++)
     {
@@ -427,7 +427,7 @@ HtOperations::SetBasicMcsSet (uint64_t ctrl1, uint64_t ctrl2)
 }
 
 uint64_t
-HtOperations::GetBasicMcsSet1 (void) const
+HtOperation::GetBasicMcsSet1 (void) const
 {
   uint64_t val = 0;
   for (uint64_t i = 63; i > 0; i--)
@@ -439,7 +439,7 @@ HtOperations::GetBasicMcsSet1 (void) const
 }
 
 uint64_t
-HtOperations::GetBasicMcsSet2 (void) const
+HtOperation::GetBasicMcsSet2 (void) const
 {
   uint64_t val = 0;
   val = val | (m_reservedMcsSet3 & 0x07ffffff);
@@ -459,7 +459,7 @@ HtOperations::GetBasicMcsSet2 (void) const
 }
 
 void
-HtOperations::SerializeInformationField (Buffer::Iterator start) const
+HtOperation::SerializeInformationField (Buffer::Iterator start) const
 {
   if (m_htSupported == 1)
     {
@@ -474,7 +474,7 @@ HtOperations::SerializeInformationField (Buffer::Iterator start) const
 }
 
 uint8_t
-HtOperations::DeserializeInformationField (Buffer::Iterator start,
+HtOperation::DeserializeInformationField (Buffer::Iterator start,
                                              uint8_t length)
 {
   Buffer::Iterator i = start;
@@ -492,25 +492,25 @@ HtOperations::DeserializeInformationField (Buffer::Iterator start,
   return length;
 }
 
-ATTRIBUTE_HELPER_CPP (HtOperations);
+ATTRIBUTE_HELPER_CPP (HtOperation);
 
 std::ostream &
-operator << (std::ostream &os, const HtOperations &htoperations)
+operator << (std::ostream &os, const HtOperation &htOperation)
 {
-  os <<  bool (htoperations.GetStaChannelWidth ())
-     << "|" << bool (htoperations.GetRifsMode ())
-     << "|" << bool (htoperations.GetDualCtsProtection());
+  os <<  bool (htOperation.GetStaChannelWidth ())
+     << "|" << bool (htOperation.GetRifsMode ())
+     << "|" << bool (htOperation.GetDualCtsProtection());
     
   return os;
 }
 
-std::istream &operator >> (std::istream &is, HtOperations &htoperations)
+std::istream &operator >> (std::istream &is, HtOperation &htOperation)
 {
   bool c1, c2, c3;
   is >> c1 >> c2 >> c3;
-  htoperations.SetStaChannelWidth (c1);
-  htoperations.SetRifsMode (c2);
-  htoperations.SetDualCtsProtection (c3);
+  htOperation.SetStaChannelWidth (c1);
+  htOperation.SetRifsMode (c2);
+  htOperation.SetDualCtsProtection (c3);
   
   return is;
 }
diff --git a/src/wifi/model/ht-operations.h b/src/wifi/model/ht-operation.h
similarity index 75%
rename from src/wifi/model/ht-operations.h
rename to src/wifi/model/ht-operation.h
index 6780a8b6d..f3c4c858d 100644
--- a/src/wifi/model/ht-operations.h
+++ b/src/wifi/model/ht-operation.h
@@ -18,8 +18,8 @@
  * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
  */
 
-#ifndef HT_OPERATIONS_H
-#define HT_OPERATIONS_H
+#ifndef HT_OPERATION_H
+#define HT_OPERATION_H
 
 #include "wifi-information-element.h"
 
@@ -40,49 +40,49 @@ enum HtProtectionType
 };
 
 /**
- * \brief The HT Operations Information Element
+ * \brief The HT Operation Information Element
  * \ingroup wifi
  *
  * This class knows how to serialise and deserialise 
- * the HT Operations Information Element
+ * the HT Operation Information Element
  *
- * \see attribute_HtOperations
+ * \see attribute_HtOperation
  */
-class HtOperations: public WifiInformationElement
+class HtOperation: public WifiInformationElement
 {
 public:
-  HtOperations ();
+  HtOperation ();
   void SetHtSupported (uint8_t htsupported);
   
   /**
-   * Set the Primary Channel field in the HT Operations information element.
+   * Set the Primary Channel field in the HT Operation information element.
    *
-   * \param ctrl the Primary Channel field in the HT Operations information element
+   * \param ctrl the Primary Channel field in the HT Operation information element
    */
   void SetPrimaryChannel (uint8_t ctrl);
   /**
-   * Set the Information Subset 1 field in the HT Operations information element.
+   * Set the Information Subset 1 field in the HT Operation information element.
    *
-   * \param ctrl the Information Subset 1 field in the HT Operations information element
+   * \param ctrl the Information Subset 1 field in the HT Operation information element
    */
   void SetInformationSubset1 (uint8_t ctrl);
   /**
-   * Set the Information Subset 2 field in the HT Operations information element.
+   * Set the Information Subset 2 field in the HT Operation information element.
    *
-   * \param ctrl the Information Subset 2 field in the HT Operations information element
+   * \param ctrl the Information Subset 2 field in the HT Operation information element
    */
   void SetInformationSubset2 (uint16_t ctrl);
   /**
-   * Set the Information Subset 3 field in the HT Operations information element.
+   * Set the Information Subset 3 field in the HT Operation information element.
    *
-   * \param ctrl the Information Subset 3 field in the HT Operations information element
+   * \param ctrl the Information Subset 3 field in the HT Operation information element
    */
   void SetInformationSubset3 (uint16_t ctrl);
   /**
-   * Set the Basic MCS Set field in the HT Operations information element.
+   * Set the Basic MCS Set field in the HT Operation information element.
    *
-   * \param ctrl1 the first 64 bytes of the Basic MCS Set field in the HT Operations information element
-   * \param ctrl2 the last 64 bytes of the Basic MCS Set field in the HT Operations information element
+   * \param ctrl1 the first 64 bytes of the Basic MCS Set field in the HT Operation information element
+   * \param ctrl2 the last 64 bytes of the Basic MCS Set field in the HT Operation information element
    */
   void SetBasicMcsSet (uint64_t ctrl1, uint64_t ctrl2);
 
@@ -109,39 +109,39 @@ public:
   void SetTxUnequalModulation (uint8_t txunequalmodulation);
   
   /*
-   * Return the Primary Channel field in the HT Operations information element.
+   * Return the Primary Channel field in the HT Operation information element.
    *
-   * \return the Primary Channel field in the HT Operations information element
+   * \return the Primary Channel field in the HT Operation information element
    */
   uint8_t GetPrimaryChannel (void) const;
   /*
-   * Return the Information Subset 1 field in the HT Operations information element.
+   * Return the Information Subset 1 field in the HT Operation information element.
    *
-   * \return the Information Subset 1 field in the HT Operations information element
+   * \return the Information Subset 1 field in the HT Operation information element
    */
   uint8_t GetInformationSubset1 (void) const;
   /*
-   * Return the Information Subset 2 field in the HT Operations information element.
+   * Return the Information Subset 2 field in the HT Operation information element.
    *
-   * \return the Information Subset 2 field in the HT Operations information element
+   * \return the Information Subset 2 field in the HT Operation information element
    */
   uint16_t GetInformationSubset2 (void) const;
   /*
-   * Return the Information Subset 3 field in the HT Operations information element.
+   * Return the Information Subset 3 field in the HT Operation information element.
    *
-   * \return the Information Subset 3 field in the HT Operations information element
+   * \return the Information Subset 3 field in the HT Operation information element
    */
   uint16_t GetInformationSubset3 (void) const;
   /*
-   * Return the first 64 bytes of the Basic MCS Set field in the HT Operations information element.
+   * Return the first 64 bytes of the Basic MCS Set field in the HT Operation information element.
    *
-   * \return the first 64 bytes of the Basic MCS Set field in the HT Operations information element
+   * \return the first 64 bytes of the Basic MCS Set field in the HT Operation information element
    */
   uint64_t GetBasicMcsSet1 (void) const;
   /*
-   * Return the last 64 bytes of the Basic MCS Set field in the HT Operations information element.
+   * Return the last 64 bytes of the Basic MCS Set field in the HT Operation information element.
    *
-   * \return the last 64 bytes of the Basic MCS Set field in the HT Operations information element
+   * \return the last 64 bytes of the Basic MCS Set field in the HT Operation information element
    */
   uint64_t GetBasicMcsSet2 (void) const;
   
@@ -184,9 +184,9 @@ public:
    */
   Buffer::Iterator Serialize (Buffer::Iterator start) const;
   /**
-   * Return the serialized size of this HT Operations IE.
+   * Return the serialized size of this HT Operation IE.
    *
-   * \return the serialized size of this HT Operations IE
+   * \return the serialized size of this HT Operation IE
    */
   uint16_t GetSerializedSize () const;
 
@@ -232,11 +232,11 @@ private:
   uint8_t m_htSupported;
 };
 
-std::ostream &operator << (std::ostream &os, const HtOperations &htoperations);
-std::istream &operator >> (std::istream &is, HtOperations &htoperations);
+std::ostream &operator << (std::ostream &os, const HtOperation &htOperation);
+std::istream &operator >> (std::istream &is, HtOperation &htOperation);
 
-ATTRIBUTE_HELPER_HEADER (HtOperations);
+ATTRIBUTE_HELPER_HEADER (HtOperation);
 
 } //namespace ns3
 
-#endif /* HT_OPERATIONS_H */
+#endif /* HT_OPERATION_H */
diff --git a/src/wifi/model/mgt-headers.cc b/src/wifi/model/mgt-headers.cc
index 583923f7b..06fc31f0b 100644
--- a/src/wifi/model/mgt-headers.cc
+++ b/src/wifi/model/mgt-headers.cc
@@ -208,15 +208,15 @@ MgtProbeResponseHeader::GetHtCapabilities (void) const
 }
 
 void
-MgtProbeResponseHeader::SetHtOperations (HtOperations htoperations)
+MgtProbeResponseHeader::SetHtOperation (HtOperation htoperation)
 {
-  m_htOperations = htoperations;
+  m_htOperation = htoperation;
 }
 
-HtOperations
-MgtProbeResponseHeader::GetHtOperations (void) const
+HtOperation
+MgtProbeResponseHeader::GetHtOperation (void) const
 {
-  return m_htOperations;
+  return m_htOperation;
 }
 
 void
@@ -316,7 +316,7 @@ MgtProbeResponseHeader::GetSerializedSize (void) const
   size += m_rates.extended.GetSerializedSize ();
   size += m_edcaParameterSet.GetSerializedSize ();
   size += m_htCapability.GetSerializedSize ();
-  size += m_htOperations.GetSerializedSize ();
+  size += m_htOperation.GetSerializedSize ();
   size += m_vhtCapability.GetSerializedSize ();
   return size;
 }
@@ -329,7 +329,7 @@ MgtProbeResponseHeader::Print (std::ostream &os) const
      << "DSSS Parameter Set=" << m_dsssParameterSet << " , "
      << "ERP information=" << m_erpInformation << ", "
      << "HT Capabilities=" << m_htCapability << " , "
-     << "HT Operations=" << m_htOperations << " , "
+     << "HT Operation=" << m_htOperation << " , "
      << "VHT Capabilities= " << m_vhtCapability;
 }
 
@@ -356,7 +356,7 @@ MgtProbeResponseHeader::Serialize (Buffer::Iterator start) const
   i = m_rates.extended.Serialize (i);
   i = m_edcaParameterSet.Serialize (i);
   i = m_htCapability.Serialize (i);
-  i = m_htOperations.Serialize (i);
+  i = m_htOperation.Serialize (i);
   i = m_vhtCapability.Serialize (i);
 }
 
@@ -375,7 +375,7 @@ MgtProbeResponseHeader::Deserialize (Buffer::Iterator start)
   i = m_rates.extended.DeserializeIfPresent (i);
   i = m_edcaParameterSet.DeserializeIfPresent (i);
   i = m_htCapability.DeserializeIfPresent (i);
-  i = m_htOperations.DeserializeIfPresent (i);
+  i = m_htOperation.DeserializeIfPresent (i);
   i = m_vhtCapability.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
 }
@@ -619,15 +619,15 @@ MgtAssocResponseHeader::GetHtCapabilities (void) const
 }
 
 void
-MgtAssocResponseHeader::SetHtOperations (HtOperations htoperations)
+MgtAssocResponseHeader::SetHtOperation (HtOperation htoperation)
 {
-  m_htOperations = htoperations;
+  m_htOperation = htoperation;
 }
 
-HtOperations
-MgtAssocResponseHeader::GetHtOperations (void) const
+HtOperation
+MgtAssocResponseHeader::GetHtOperation (void) const
 {
-  return m_htOperations;
+  return m_htOperation;
 }
 
 void
@@ -695,7 +695,7 @@ MgtAssocResponseHeader::GetSerializedSize (void) const
   size += m_rates.extended.GetSerializedSize ();
   size += m_edcaParameterSet.GetSerializedSize ();
   size += m_htCapability.GetSerializedSize ();
-  size += m_htOperations.GetSerializedSize ();
+  size += m_htOperation.GetSerializedSize ();
   size += m_vhtCapability.GetSerializedSize ();
   return size;
 }
@@ -707,7 +707,7 @@ MgtAssocResponseHeader::Print (std::ostream &os) const
      << "rates=" << m_rates << ", "
      << "ERP information=" << m_erpInformation << ", "
      << "HT Capabilities=" << m_htCapability << " , "
-     << "HT Operations=" << m_htOperations << " , "
+     << "HT Operation=" << m_htOperation << " , "
      << "VHT Capabilities= " << m_vhtCapability;
 }
 
@@ -723,7 +723,7 @@ MgtAssocResponseHeader::Serialize (Buffer::Iterator start) const
   i = m_rates.extended.Serialize (i);
   i = m_edcaParameterSet.Serialize (i);
   i = m_htCapability.Serialize (i);
-  i = m_htOperations.Serialize (i);
+  i = m_htOperation.Serialize (i);
   i = m_vhtCapability.Serialize (i);
 }
 
@@ -739,7 +739,7 @@ MgtAssocResponseHeader::Deserialize (Buffer::Iterator start)
   i = m_rates.extended.DeserializeIfPresent (i);
   i = m_edcaParameterSet.DeserializeIfPresent (i);
   i = m_htCapability.DeserializeIfPresent (i);
-  i = m_htOperations.DeserializeIfPresent (i);
+  i = m_htOperation.DeserializeIfPresent (i);
   i = m_vhtCapability.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
 }
diff --git a/src/wifi/model/mgt-headers.h b/src/wifi/model/mgt-headers.h
index 79ff66f50..e5c83548d 100644
--- a/src/wifi/model/mgt-headers.h
+++ b/src/wifi/model/mgt-headers.h
@@ -29,7 +29,7 @@
 #include "ssid.h"
 #include "dsss-parameter-set.h"
 #include "ht-capabilities.h"
-#include "ht-operations.h"
+#include "ht-operation.h"
 #include "vht-capabilities.h"
 #include "erp-information.h"
 #include "edca-parameter-set.h"
@@ -182,11 +182,11 @@ public:
    */
   HtCapabilities GetHtCapabilities (void) const;
   /**
-   * Return the HT operations.
+   * Return the HT operation.
    *
-   * \return HT operations
+   * \return HT operation
    */
-  HtOperations GetHtOperations (void) const;
+  HtOperation GetHtOperation (void) const;
   /**
    * Return the ERP information.
    *
@@ -218,11 +218,11 @@ public:
    */
   void SetHtCapabilities (HtCapabilities htcapabilities);
   /**
-   * Set the HT operations.
+   * Set the HT operation.
    *
-   * \param htoperations HT operations
+   * \param htoperation HT operation
    */
-  void SetHtOperations (HtOperations htoperations);
+  void SetHtOperation (HtOperation htoperation);
   /**
    * Set the supported rates.
    *
@@ -266,7 +266,7 @@ private:
   StatusCode m_code; //!< Status code
   uint16_t m_aid;
   HtCapabilities m_htCapability; //!< HT capabilities
-  HtOperations m_htOperations; //!< HT operations
+  HtOperation m_htOperation; //!< HT operation
   VhtCapabilities m_vhtCapability; //!< VHT capabilities
   ErpInformation m_erpInformation; //!< ERP information
   EdcaParameterSet m_edcaParameterSet; //!< EDCA Parameter Set
@@ -398,11 +398,11 @@ public:
    */
   HtCapabilities GetHtCapabilities (void) const;
   /**
-   * Return the HT operations.
+   * Return the HT operation.
    *
-   * \return HT operations
+   * \return HT operation
    */
-  HtOperations GetHtOperations (void) const;
+  HtOperation GetHtOperation (void) const;
   /**
    * Return the VHT capabilities.
    *
@@ -434,11 +434,11 @@ public:
    */
   void SetHtCapabilities (HtCapabilities htcapabilities);
   /**
-   * Set the HT operations.
+   * Set the HT operation.
    *
-   * \param htoperations HT operations
+   * \param htoperation HT operation
    */
-  void SetHtOperations (HtOperations htoperations);
+  void SetHtOperation (HtOperation htoperation);
   /**
    * Set the VHT capabilities.
    *
@@ -508,7 +508,7 @@ private:
   CapabilityInformation m_capability;  //!< Capability information
   DsssParameterSet m_dsssParameterSet; //!< DSSS Parameter Set
   HtCapabilities m_htCapability;       //!< HT capabilities
-  HtOperations m_htOperations;         //!< HT operations
+  HtOperation m_htOperation;           //!< HT operation
   VhtCapabilities m_vhtCapability;     //!< VHT capabilities
   ErpInformation m_erpInformation;     //!< ERP information
   EdcaParameterSet m_edcaParameterSet; //!< EDCA Parameter Set
diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc
index 26ef2cc8f..fcc5e7801 100644
--- a/src/wifi/model/sta-wifi-mac.cc
+++ b/src/wifi/model/sta-wifi-mac.cc
@@ -713,7 +713,7 @@ StaWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
               if (m_htSupported)
                 {
                   HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();
-                  HtOperations htOperations = assocResp.GetHtOperations ();
+                  HtOperation htOperation = assocResp.GetHtOperation ();
                   m_stationManager->AddStationHtCapabilities (hdr->GetAddr2 (), htcapabilities);
                 }
               if (m_vhtSupported)
diff --git a/src/wifi/model/wifi-information-element.h b/src/wifi/model/wifi-information-element.h
index 837d580d7..d951bd4a3 100644
--- a/src/wifi/model/wifi-information-element.h
+++ b/src/wifi/model/wifi-information-element.h
@@ -92,7 +92,7 @@ typedef uint8_t WifiInformationElementId;
 #define IE_DSE_REGISTERED_LOCATION              ((WifiInformationElementId)58)
 #define IE_SUPPORTED_OPERATING_CLASSES          ((WifiInformationElementId)59)
 #define IE_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT ((WifiInformationElementId)60)
-#define IE_HT_OPERATIONS                        ((WifiInformationElementId)61)
+#define IE_HT_OPERATION                         ((WifiInformationElementId)61)
 #define IE_SECONDARY_CHANNEL_OFFSET             ((WifiInformationElementId)62)
 #define IE_BSS_AVERAGE_ACCESS_DELAY             ((WifiInformationElementId)63)
 #define IE_ANTENNA                              ((WifiInformationElementId)64)
diff --git a/src/wifi/wscript b/src/wifi/wscript
index 3b07f7733..32e1be474 100644
--- a/src/wifi/wscript
+++ b/src/wifi/wscript
@@ -78,7 +78,7 @@ def build(bld):
         'model/wifi-tx-current-model.cc',
         'model/vht-capabilities.cc',
         'model/erp-information.cc',
-        'model/ht-operations.cc',
+        'model/ht-operation.cc',
         'model/dsss-parameter-set.cc',
         'model/edca-parameter-set.cc',
         'helper/wifi-radio-energy-model-helper.cc',
@@ -183,7 +183,7 @@ def build(bld):
         'model/wifi-tx-current-model.h',
         'model/vht-capabilities.h',
         'model/erp-information.h',
-        'model/ht-operations.h',
+        'model/ht-operation.h',
         'model/dsss-parameter-set.h',
         'model/edca-parameter-set.h',
         'helper/wifi-radio-energy-model-helper.h',