diff --git a/lib/API/Log.pm b/lib/API/Log.pm
index f7a4fbd..258d9de 100644
--- a/lib/API/Log.pm
+++ b/lib/API/Log.pm
@@ -129,7 +129,7 @@ sub slog
         }
 
         # Check if we're in the channel.
-        if (!defined $Parser::IRC::botchans{$net}{$chan}) {
+        if (!defined $Proto::IRC::botchans{$net}{$chan}) {
             dbug 'WARNING: slog(): Unable to log to IRC: Not in channel.';
             alog 'WARNING: slog(): Unable to log to IRC: Not in channel.';
             return;
diff --git a/lib/API/Std.pm b/lib/API/Std.pm
index 876ce6d..9704484 100644
--- a/lib/API/Std.pm
+++ b/lib/API/Std.pm
@@ -266,9 +266,9 @@ sub rchook_add
     my ($cmd, $sub) = @_;
     $cmd = uc $cmd;
 
-    if (defined $Parser::IRC::RAWC{$cmd}) { return; }
+    if (defined $Proto::IRC::RAWC{$cmd}) { return; }
 
-    $Parser::IRC::RAWC{$cmd} = $sub;
+    $Proto::IRC::RAWC{$cmd} = $sub;
 
     return 1;
 }
@@ -279,9 +279,9 @@ sub rchook_del
     my ($cmd) = @_;
     $cmd = uc $cmd;
 
-    if (!defined $Parser::IRC::RAWC{$cmd}) { return; }
+    if (!defined $Proto::IRC::RAWC{$cmd}) { return; }
 
-    delete $Parser::IRC::RAWC{$cmd};
+    delete $Proto::IRC::RAWC{$cmd};
 
     return 1;
 }
@@ -386,15 +386,15 @@ sub match_user
                 my $svr = $ulhp{net}[0];
                 if (defined $Auto::SOCKET{$svr}) {
                     if ($ccnm eq 'CURRENT' and defined $user{chan}) {
-                        if (defined $Parser::IRC::chanusers{$svr}{$user{chan}}{$user{nick}}) {
-                            if ($Parser::IRC::chanusers{$svr}{$user{chan}}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
+                        if (defined $Proto::IRC::chanusers{$svr}{$user{chan}}{$user{nick}}) {
+                            if ($Proto::IRC::chanusers{$svr}{$user{chan}}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
                         }
                     }
                     else {
-                        foreach my $bcj (keys %{ $Parser::IRC::botchans{$svr} }) {
+                        foreach my $bcj (keys %{ $Proto::IRC::botchans{$svr} }) {
                             if (API::IRC::match_mask($bcj, $ccnm)) {
-                                if (defined $Parser::IRC::chanusers{$svr}{$bcj}{$user{nick}}) {
-                                    if ($Parser::IRC::chanusers{$svr}{$bcj}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
+                                if (defined $Proto::IRC::chanusers{$svr}{$bcj}{$user{nick}}) {
+                                    if ($Proto::IRC::chanusers{$svr}{$bcj}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
                                 }
                             }
                         }
diff --git a/lib/Core/IRC.pm b/lib/Core/IRC.pm
index 57d9443..6617b20 100644
--- a/lib/Core/IRC.pm
+++ b/lib/Core/IRC.pm
@@ -32,8 +32,8 @@ hook_add("on_quit", "quit_update_chanusers", sub {
     my %src = %{ $src };
 
     # Delete the user from all channels.
-    foreach my $ccu (keys %{ $Parser::IRC::chanusers{$svr} }) {
-        if (defined $Parser::IRC::chanusers{$svr}{$ccu}{$src{nick}}) { delete $Parser::IRC::chanusers{$svr}{$ccu}{$src{nick}}; }
+    foreach my $ccu (keys %{ $Proto::IRC::chanusers{$svr} }) {
+        if (defined $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}) { delete $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}; }
     }
 
     return 1;
diff --git a/lib/Proto/IRC.pm b/lib/Proto/IRC.pm
index 4237a3e..313a6ea 100644
--- a/lib/Proto/IRC.pm
+++ b/lib/Proto/IRC.pm
@@ -220,7 +220,7 @@ sub num438
     
     if (defined $botnick{$svr}{newnick}) {
     	API::Std::timer_add("num438_".$botnick{$svr}{newnick}, 1, $ex[11], sub { 
-    		API::IRC::nick($Parser::IRC::botnick{$svr}{newnick});
+    		API::IRC::nick($Proto::IRC::botnick{$svr}{newnick});
     		delete $botnick{$svr}{newnick} if (defined $botnick{$svr}{newnick});
     	 });
     }