diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index f932831dac12e6c7e6971fc262910d0095e2e3f0..3021d869afa4fc21514882425cc0a01e916a771a 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -904,35 +904,35 @@ void CABACReader::cu_gbi_flag(CodingUnit& cu)
 #endif
 
 #if JVET_L0165_6MPM
-void CABACReader::xReadTruncBinCode(unsigned& ruiSymbol, int uiMaxSymbol)
+void CABACReader::xReadTruncBinCode(uint32_t& symbol, uint32_t maxSymbol)
 {
-  int uiThresh;
-  if (uiMaxSymbol > 256)
+  int thresh;
+  if (maxSymbol > 256)
   {
-    int uiThreshVal = 1 << 8;
-    uiThresh = 8;
-    while (uiThreshVal <= uiMaxSymbol)
+    int threshVal = 1 << 8;
+    thresh = 8;
+    while (threshVal <= maxSymbol)
     {
-      uiThresh++;
-      uiThreshVal <<= 1;
+      thresh++;
+      threshVal <<= 1;
     }
-    uiThresh--;
+    thresh--;
   }
   else
   {
-    uiThresh = g_tbMax[uiMaxSymbol];
+    thresh = g_tbMax[maxSymbol];
   }
 
-  int uiVal = 1 << uiThresh;
-  int b = uiMaxSymbol - uiVal;
-  ruiSymbol = m_BinDecoder.decodeBinsEP(uiThresh);
-  if (ruiSymbol >= uiVal - b)
+  int val = 1 << thresh;
+  int b = maxSymbol - val;
+  symbol = m_BinDecoder.decodeBinsEP(thresh);
+  if (symbol >= val - b)
   {
-    uint32_t uiSymbol;
-    uiSymbol = m_BinDecoder.decodeBinEP();
-    ruiSymbol <<= 1;
-    ruiSymbol += uiSymbol;
-    ruiSymbol -= (uiVal - b);
+    uint32_t altSymbol;
+    altSymbol = m_BinDecoder.decodeBinEP();
+    symbol <<= 1;
+    symbol += altSymbol;
+    symbol -= (val - b);
   }
 }
 #endif
diff --git a/source/Lib/DecoderLib/CABACReader.h b/source/Lib/DecoderLib/CABACReader.h
index 681633423702cf23e5fefb547191879a4fff5c50..4b5d281287ed7774e63c976d092cbc3b019d2b92 100644
--- a/source/Lib/DecoderLib/CABACReader.h
+++ b/source/Lib/DecoderLib/CABACReader.h
@@ -150,7 +150,7 @@ private:
   unsigned    get_num_bits_read         () { return m_BinDecoder.getNumBitsRead(); }
 
 #if JVET_L0165_6MPM
-  void        xReadTruncBinCode(unsigned& ruiSymbol, int uiMaxSymbol);
+  void        xReadTruncBinCode(uint32_t& symbol, uint32_t maxSymbol);
 #endif
 
 private:
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index a34b5fb37de6456d5255f5403495bbd56b49dea2..1b318ee19cf48268e67f00794c44f4f6b4514875 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -774,41 +774,41 @@ void CABACWriter::cu_gbi_flag(const CodingUnit& cu)
 #endif
 
 #if JVET_L0165_6MPM
-void CABACWriter::xWriteTruncBinCode(unsigned uiSymbol, int uiMaxSymbol)
+void CABACWriter::xWriteTruncBinCode(uint32_t symbol, uint32_t maxSymbol)
 {
-  int uiThresh;
-  if (uiMaxSymbol > 256)
+  int thresh;
+  if (maxSymbol > 256)
   {
-    int uiThreshVal = 1 << 8;
-    uiThresh = 8;
-    while (uiThreshVal <= uiMaxSymbol)
+    int threshVal = 1 << 8;
+    thresh = 8;
+    while (threshVal <= maxSymbol)
     {
-      uiThresh++;
-      uiThreshVal <<= 1;
+      thresh++;
+      threshVal <<= 1;
     }
-    uiThresh--;
+    thresh--;
   }
   else
   {
-    uiThresh = g_tbMax[uiMaxSymbol];
+    thresh = g_tbMax[maxSymbol];
   }
 
-  int uiVal = 1 << uiThresh;
-  assert(uiVal <= uiMaxSymbol);
-  assert((uiVal << 1) > uiMaxSymbol);
-  assert(uiSymbol < uiMaxSymbol);
-  int b = uiMaxSymbol - uiVal;
-  assert(b < uiVal);
-  if (uiSymbol < uiVal - b)
+  int val = 1 << thresh;
+  assert(val <= maxSymbol);
+  assert((val << 1) > maxSymbol);
+  assert(symbol < maxSymbol);
+  int b = maxSymbol - val;
+  assert(b < val);
+  if (symbol < val - b)
   {
-    m_BinEncoder.encodeBinsEP(uiSymbol, uiThresh);
+    m_BinEncoder.encodeBinsEP(symbol, thresh);
   }
   else
   {
-    uiSymbol += uiVal - b;
-    assert(uiSymbol < (uiVal << 1));
-    assert((uiSymbol >> 1) >= uiVal - b);
-    m_BinEncoder.encodeBinsEP(uiSymbol, uiThresh + 1);
+    symbol += val - b;
+    assert(symbol < (val << 1));
+    assert((symbol >> 1) >= val - b);
+    m_BinEncoder.encodeBinsEP(symbol, thresh + 1);
   }
 }
 #endif
diff --git a/source/Lib/EncoderLib/CABACWriter.h b/source/Lib/EncoderLib/CABACWriter.h
index fef6d459e804b2a8973748d1559452feff00301e..fc06402692c2317da9a94c7efe2977e1fb83e7d3 100644
--- a/source/Lib/EncoderLib/CABACWriter.h
+++ b/source/Lib/EncoderLib/CABACWriter.h
@@ -170,7 +170,7 @@ private:
   unsigned    get_num_written_bits()    { return m_BinEncoder.getNumWrittenBits(); }
 
 #if JVET_L0165_6MPM
-  void  xWriteTruncBinCode(unsigned uiSymbol, int uiMaxSymbol);
+  void  xWriteTruncBinCode(uint32_t uiSymbol, uint32_t uiMaxSymbol);
 #endif
 
 private: