4 files changed, 7 insertions, 7 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp
index d5963d24..95bd5af4 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -1889,7 +1889,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const int *attrList)
         return ALC_NO_ERROR;
 
     device->AvgSpeakerDist = 0.0f;
-    device->Uhj_Encoder = nullptr;
+    device->mUhjEncoder = nullptr;
     device->AmbiDecoder = nullptr;
     device->Bs2b = nullptr;
     device->PostProcess = nullptr;
@@ -2000,8 +2000,8 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const int *attrList)
         device->AuxiliaryEffectSlotMax, device->NumAuxSends);
 
     nanoseconds::rep sample_delay{0};
-    if(device->Uhj_Encoder)
-        sample_delay += Uhj2Encoder::sFilterDelay;
+    if(device->mUhjEncoder)
+        sample_delay += UhjEncoder::sFilterDelay;
     if(device->mHrtfState)
         sample_delay += HrtfDirectDelay;
     if(auto *ambidec = device->AmbiDecoder.get())
diff --git a/alc/alcmain.h b/alc/alcmain.h
index fa5fbdf1..7134dccf 100644
--- a/alc/alcmain.h
+++ b/alc/alcmain.h
@@ -39,7 +39,7 @@ struct ALfilter;
 struct BackendBase;
 struct Compressor;
 struct EffectState;
-struct Uhj2Encoder;
+struct UhjEncoder;
 struct bs2b;
 
 using uint = unsigned int;
@@ -249,7 +249,7 @@ struct ALCdevice : public al::intrusive_ref<ALCdevice> {
     uint mIrSize{0};
 
     /* Ambisonic-to-UHJ encoder */
-    std::unique_ptr<Uhj2Encoder> Uhj_Encoder;
+    std::unique_ptr<UhjEncoder> mUhjEncoder;
 
     /* Ambisonic decoder for speakers */
     std::unique_ptr<BFormatDec> AmbiDecoder;
diff --git a/alc/alu.cpp b/alc/alu.cpp
index 57cea740..8dd36fb3 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -312,7 +312,7 @@ void ALCdevice::ProcessUhj(const size_t SamplesToDo)
     const uint ridx{RealOut.ChannelIndex[FrontRight]};
 
     /* Encode to stereo-compatible 2-channel UHJ output. */
-    Uhj_Encoder->encode(RealOut.Buffer[lidx], RealOut.Buffer[ridx], Dry.Buffer.data(),
+    mUhjEncoder->encode(RealOut.Buffer[lidx], RealOut.Buffer[ridx], Dry.Buffer.data(),
         SamplesToDo);
 }
 
diff --git a/alc/panning.cpp b/alc/panning.cpp
index 4620bc98..4c2e14c6 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -1024,7 +1024,7 @@ no_hrtf:
     }
     if(device->mRenderMode == RenderMode::Normal)
     {
-        device->Uhj_Encoder = std::make_unique<Uhj2Encoder>();
+        device->mUhjEncoder = std::make_unique<UhjEncoder>();
         TRACE("UHJ enabled\n");
         InitUhjPanning(device);
         device->PostProcess = &ALCdevice::ProcessUhj;