diff --git a/game/sound/989snd/ame_handler.cpp b/game/sound/989snd/ame_handler.cpp
index d8eff315899..c3cd6bdd7ae 100644
--- a/game/sound/989snd/ame_handler.cpp
+++ b/game/sound/989snd/ame_handler.cpp
@@ -12,7 +12,7 @@ namespace snd {
 u64 SoundFlavaHack = 0;
 u8 GlobalExcite = 0;
 
-ame_handler::ame_handler(MultiMidi* block,
+AmeHandler::AmeHandler(MultiMidi* block,
                          VoiceManager& vm,
                          MusicBank::MIDISound& sound,
                          s32 vol,
@@ -35,10 +35,10 @@ ame_handler::ame_handler(MultiMidi* block,
     m_pan = pan;
   }
 
-  start_segment(0);
+  StartSegment(0);
 };
 
-bool ame_handler::Tick() {
+bool AmeHandler::Tick() {
   for (auto it = m_midis.begin(); it != m_midis.end();) {
     bool done = it->second->Tick();
     if (done) {
@@ -51,7 +51,7 @@ bool ame_handler::Tick() {
   return m_midis.empty();
 };
 
-void ame_handler::start_segment(u32 id) {
+void AmeHandler::StartSegment(u32 id) {
   if (m_midis.find(id) == m_midis.end()) {
     auto& midi = m_header->midi[id];
 
@@ -64,14 +64,14 @@ void ame_handler::start_segment(u32 id) {
   }
 }
 
-void ame_handler::Stop() {
+void AmeHandler::Stop() {
   for (auto it = m_midis.begin(); it != m_midis.end();) {
     it->second->Stop();
     it = m_midis.erase(it);
   }
 }
 
-void ame_handler::stop_segment(u32 id) {
+void AmeHandler::StopSegment(u32 id) {
   auto m = m_midis.find(id);
   if (m == m_midis.end())
     return;
@@ -79,19 +79,19 @@ void ame_handler::stop_segment(u32 id) {
   m->second->Stop();
 }
 
-void ame_handler::Pause() {
+void AmeHandler::Pause() {
   for (auto& m : m_midis) {
     m.second->Pause();
   }
 }
 
-void ame_handler::Unpause() {
+void AmeHandler::Unpause() {
   for (auto& m : m_midis) {
     m.second->Unpause();
   }
 }
 
-void ame_handler::SetVolPan(s32 vol, s32 pan) {
+void AmeHandler::SetVolPan(s32 vol, s32 pan) {
   if (vol >= 0) {
     if (vol != VOLUME_DONT_CHANGE) {
       m_vol = (m_sound.Vol * vol) >> 10;
@@ -115,7 +115,7 @@ void ame_handler::SetVolPan(s32 vol, s32 pan) {
   }
 }
 
-void ame_handler::SetPMod(s32 mod) {
+void AmeHandler::SetPMod(s32 mod) {
   for (auto& m : m_midis) {
     m.second->SetPMod(mod);
   }
@@ -134,7 +134,7 @@ void ame_handler::SetPMod(s32 mod) {
     ;              \
   stream += (x);
 
-std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
+std::pair<bool, u8*> AmeHandler::RunAME(MidiHandler& midi, u8* stream) {
   int skip = 0;
   bool done = false;
   bool cont = true;
@@ -179,7 +179,7 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
       } break;
       case 0x3: {
         AME_BEGIN(op)
-        stop_segment(stream[0]);
+        StopSegment(stream[0]);
         AME_END(1)
       } break;
       case 0x4: {
@@ -218,7 +218,7 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
       } break;
       case 0xc: {
         AME_BEGIN(op)
-        auto [sub_cont, ptr] = run_ame(midi, m_macro[stream[0]]);
+        auto [sub_cont, ptr] = RunAME(midi, m_macro[stream[0]]);
         if (!sub_cont) {
           cont = false;
           done = true;
@@ -229,12 +229,12 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
         AME_BEGIN(op)
         cont = false;
         done = true;
-        start_segment(m_register[stream[0]] - 1);
+        StartSegment(m_register[stream[0]] - 1);
         AME_END(1)
       } break;
       case 0xe: {
         AME_BEGIN(op)
-        start_segment(m_register[stream[0]] - 1);
+        StartSegment(m_register[stream[0]] - 1);
         AME_END(1)
       } break;
       case 0xf: {
@@ -289,12 +289,12 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
         AME_BEGIN(op)
         done = true;
         cont = false;
-        start_segment(stream[0]);
+        StartSegment(stream[0]);
         AME_END(1)
       } break;
       case 0x12: {
         AME_BEGIN(op)
-        start_segment(stream[0]);
+        StartSegment(stream[0]);
         AME_END(1)
       } break;
       case 0x13: {
@@ -327,7 +327,7 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
         AME_END(2)
       } break;
       default: {
-        throw ame_error(fmt::format("Unhandled AME event {:02x}", (u8)op));
+        throw AMEError(fmt::format("Unhandled AME event {:02x}", (u8)op));
       } break;
     }
 
diff --git a/game/sound/989snd/ame_handler.h b/game/sound/989snd/ame_handler.h
index 75c97de2dd5..0f95ffc4312 100644
--- a/game/sound/989snd/ame_handler.h
+++ b/game/sound/989snd/ame_handler.h
@@ -19,11 +19,11 @@ extern u64 SoundFlavaHack;
 extern u8 GlobalExcite;
 
 class MidiHandler;
-class ame_handler : public SoundHandler {
+class AmeHandler : public SoundHandler {
   friend class MidiHandler;
 
  public:
-  ame_handler(MultiMidi* block,
+  AmeHandler(MultiMidi* block,
               VoiceManager& vm,
               MusicBank::MIDISound& sound,
               s32 vol,
@@ -42,9 +42,9 @@ class ame_handler : public SoundHandler {
   void SetPMod(s32 mod) override;
 
  private:
-  struct ame_error : public std::exception {
-    ame_error(std::string text) : msg(std::move(text)) {}
-    ame_error() : msg("Unknown AME error") {}
+  struct AMEError : public std::exception {
+    AMEError(std::string text) : msg(std::move(text)) {}
+    AMEError() : msg("Unknown AME error") {}
     std::string msg;
     const char* what() const noexcept override { return msg.c_str(); }
   };
@@ -58,9 +58,9 @@ class ame_handler : public SoundHandler {
     /*  24 */ s8 excite_max[16];
   };
 
-  void start_segment(u32 id);
-  void stop_segment(u32 id);
-  std::pair<bool, u8*> run_ame(MidiHandler&, u8* stream);
+  void StartSegment(u32 id);
+  void StopSegment(u32 id);
+  std::pair<bool, u8*> RunAME(MidiHandler&, u8* stream);
 
   MusicBank::MIDISound& m_sound;
   SoundBank& m_bank;
diff --git a/game/sound/989snd/midi_handler.cpp b/game/sound/989snd/midi_handler.cpp
index 31e781f7817..aba131ee9a5 100644
--- a/game/sound/989snd/midi_handler.cpp
+++ b/game/sound/989snd/midi_handler.cpp
@@ -53,7 +53,7 @@ MidiHandler::MidiHandler(Midi* block,
                            s32 vol,
                            s32 pan,
                            SoundBank& bank,
-                           std::optional<ame_handler*> parent)
+                           std::optional<AmeHandler*> parent)
     : m_parent(parent),
       m_sound(sound),
       m_vol(vol),
@@ -396,7 +396,7 @@ void MidiHandler::SystemEvent() {
     case 0x75:
       m_seq_ptr++;
       if (m_parent.has_value()) {
-        auto [cont, ptr] = m_parent.value()->run_ame(*this, m_seq_ptr);
+        auto [cont, ptr] = m_parent.value()->RunAME(*this, m_seq_ptr);
         m_seq_ptr = ptr;
 
         if (!cont) {
diff --git a/game/sound/989snd/midi_handler.h b/game/sound/989snd/midi_handler.h
index 92490a2a689..78e13e8b462 100644
--- a/game/sound/989snd/midi_handler.h
+++ b/game/sound/989snd/midi_handler.h
@@ -26,7 +26,7 @@ class midi_voice : public VagVoice {
   MusicBank::Prog& prog;
 };
 
-class ame_handler;
+class AmeHandler;
 class MidiHandler : public SoundHandler {
  public:
   MidiHandler(Midi* block,
@@ -42,7 +42,7 @@ class MidiHandler : public SoundHandler {
                s32 vol,
                s32 pan,
                SoundBank& bank,
-               std::optional<ame_handler*> parent);
+               std::optional<AmeHandler*> parent);
 
   ~MidiHandler() override {
     for (auto& p : m_voices) {
@@ -78,7 +78,7 @@ class MidiHandler : public SoundHandler {
     const char* what() const noexcept override { return msg.c_str(); }
   };
 
-  std::optional<ame_handler*> m_parent;
+  std::optional<AmeHandler*> m_parent;
 
   std::list<std::weak_ptr<midi_voice>> m_voices;
 
diff --git a/game/sound/989snd/musicbank.cpp b/game/sound/989snd/musicbank.cpp
index f795f1e4fe0..de5f46127ab 100644
--- a/game/sound/989snd/musicbank.cpp
+++ b/game/sound/989snd/musicbank.cpp
@@ -28,7 +28,7 @@ std::optional<std::unique_ptr<SoundHandler>> MusicBank::MakeHandler(VoiceManager
   } else if (sound.Type == 5) {
     auto& midi = std::get<MultiMidi>(MidiData);
     if (sound.MIDIID == midi.ID) {
-      return std::make_unique<ame_handler>(&midi, vm, sound, vol, pan, *this);
+      return std::make_unique<AmeHandler>(&midi, vm, sound, vol, pan, *this);
     }
     return std::nullopt;
   } else {