diff --git a/ChangeLog b/ChangeLog
index 13a2160b..c53f54aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ version 2.07 ()
     * [2980789] Fix root_ip to try OSPF RouterID first (Brian De Wolf)
     * [2986858] Fix the patch from this ticket (Oliver Gorwits)
     * [3076592] Not an ARRAY reference in Info.pm (Oliver Gorwits)
+    * [3136084] Rename Allied Telesyn to Allied Telesis (Oliver Gorwits)
 
 version 2.06 (2011-09-28)
 
diff --git a/DeviceMatrix.txt b/DeviceMatrix.txt
index 3973d036..79cbcd0a 100644
--- a/DeviceMatrix.txt
+++ b/DeviceMatrix.txt
@@ -45,7 +45,7 @@ device: All
 #
 # Allied
 #
-device-vendor: Allied Telesyn
+device-vendor: Allied Telesis
 cdp:no
 class: Layer1::Allied
 ver: 1
diff --git a/Info.pm b/Info.pm
index 01a138f1..d281059e 100644
--- a/Info.pm
+++ b/Info.pm
@@ -417,7 +417,7 @@ See documentation in L<SNMP::Info::Layer1> for details.
 
 =item SNMP::Info::Layer1::Allied
 
-Subclass for Allied Telesys Repeaters / Hubs.  
+Subclass for Allied Telesis Repeaters / Hubs.  
 
 Requires F<ATI-MIB>
 
@@ -476,7 +476,7 @@ See documentation in L<SNMP::Info::Layer2::Aironet> for details.
 
 =item SNMP::Info::Layer2::Allied
 
-Allied Telesys switches.
+Allied Telesis switches.
 
 See documentation in L<SNMP::Info::Layer2::Allied> for details.
 
@@ -1354,7 +1354,7 @@ sub device_type {
         # SonicWALL
         $objtype = 'SNMP::Info::Layer3::SonicWALL' if $desc =~ /SonicWALL/i;
 
-        # Allied Telesyn Layer2 managed switches. They report they have L3 support
+        # Allied Telesis Layer2 managed switches. They report they have L3 support
         $objtype = 'SNMP::Info::Layer2::Allied'
             if ( $desc =~ /Allied.*AT-80\d{2}\S*/i );
 
diff --git a/Info/Layer2/Allied.pm b/Info/Layer2/Allied.pm
index 5806029c..182ee54f 100644
--- a/Info/Layer2/Allied.pm
+++ b/Info/Layer2/Allied.pm
@@ -129,7 +129,7 @@ __END__
 
 =head1 NAME
 
-SNMP::Info::Layer2::Allied - SNMP Interface to Allied Telesyn switches
+SNMP::Info::Layer2::Allied - SNMP Interface to Allied Telesis switches
 
 =head1 AUTHOR