diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 799f3ec..c5e9f48 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ===============================================================================
+    * Proto::IRC::umodes renamed to Proto::IRC::botinfo{svr}{modes}.
     * Fixed a bug where incoming PART's from ourselves were not parsed.
     * Our usermodes are now tracked in Proto::IRC::umodes.
     * Added events on_cmode and on_umode.
diff --git a/lib/Core/IRC.pm b/lib/Core/IRC.pm
index 5a6fd0e..37c0ae1 100644
--- a/lib/Core/IRC.pm
+++ b/lib/Core/IRC.pm
@@ -223,10 +223,10 @@ hook_add('on_umode', 'core.irc.state.umode', sub {
         else {
             # Adjust our modes.
             if ($op) {
-                $Proto::IRC::umodes{$svr} .= $_;
+                $Proto::IRC::botinfo{$svr}{modes} .= $_;
             }
             else {
-                $Proto::IRC::umodes{$svr} =~ s/($_)//xsm;
+                $Proto::IRC::botinfo{$svr}{modes} =~ s/($_)//xsm;
             }
         }
     }
diff --git a/lib/Proto/IRC.pm b/lib/Proto/IRC.pm
index 965aa50..b338de9 100644
--- a/lib/Proto/IRC.pm
+++ b/lib/Proto/IRC.pm
@@ -38,7 +38,7 @@ our %RAWC = (
 );
 
 # Variables for various functions.
-our (%got_001, %botinfo, %botchans, %csprefix, %chanusers, %chanmodes, %cap, %umodes);
+our (%got_001, %botinfo, %botchans, %csprefix, %chanusers, %chanmodes, %cap);
 
 # Events.
 API::Std::event_add('on_capack');