diff --git a/stl/inc/random b/stl/inc/random
index 4bef1ed35fa..54ad1c4a4d9 100644
--- a/stl/inc/random
+++ b/stl/inc/random
@@ -4376,12 +4376,12 @@ private:
     template <class _Engine>
     result_type _Eval(_Engine& _Eng, const param_type& _Par0) const {
         double _Vx1;
-        gamma_distribution<double> dist1(
+        gamma_distribution<double> _Dist1(
             static_cast<double>(_Par0._Kx), static_cast<double>((_Ty{1} - _Par0._Px) / _Par0._Px));
-        _Vx1 = dist1(_Eng);
-        poisson_distribution<_Ty> dist2(_Vx1);
+        _Vx1 = _Dist1(_Eng);
+        poisson_distribution<_Ty> _Dist2(_Vx1);
 
-        return dist2(_Eng);
+        return _Dist2(_Eng);
     }
 
     param_type _Par;
diff --git a/stl/inc/xmemory b/stl/inc/xmemory
index ca3bb9bc9bf..524d41f829f 100644
--- a/stl/inc/xmemory
+++ b/stl/inc/xmemory
@@ -1870,7 +1870,7 @@ struct _In_place_key_extract_set<_Key, _Key> {
 
 // STRUCT TEMPLATE _In_place_key_extract_map
 // assumes _Args have already been _Remove_cvref_t'd
-template <class _Key, class... Args>
+template <class _Key, class... _Args>
 struct _In_place_key_extract_map {
     // by default we can't extract the key in the emplace family and must construct a node we might not use
     static constexpr bool _Extractable = false;