diff --git a/devices/igb/e1000_82575-6.4-ethercat.c b/devices/igb/e1000_82575-6.4-ethercat.c
index 9628c7a0..74e2b21e 100644
--- a/devices/igb/e1000_82575-6.4-ethercat.c
+++ b/devices/igb/e1000_82575-6.4-ethercat.c
@@ -11,10 +11,10 @@
 #include <linux/if_ether.h>
 #include <linux/i2c.h>
 
-#include "e1000_mac-6.1-ethercat.h"
-#include "e1000_82575-6.1-ethercat.h"
-#include "e1000_i210-6.1-ethercat.h"
-#include "igb-6.1-ethercat.h"
+#include "e1000_mac-6.4-ethercat.h"
+#include "e1000_82575-6.4-ethercat.h"
+#include "e1000_i210-6.4-ethercat.h"
+#include "igb-6.4-ethercat.h"
 
 static s32  igb_get_invariants_82575(struct e1000_hw *);
 static s32  igb_acquire_phy_82575(struct e1000_hw *);
diff --git a/devices/igb/e1000_hw-6.4-ethercat.h b/devices/igb/e1000_hw-6.4-ethercat.h
index 6ce51b3a..efb658c9 100644
--- a/devices/igb/e1000_hw-6.4-ethercat.h
+++ b/devices/igb/e1000_hw-6.4-ethercat.h
@@ -9,8 +9,8 @@
 #include <linux/io.h>
 #include <linux/netdevice.h>
 
-#include "e1000_regs-6.1-ethercat.h"
-#include "e1000_defines-6.1-ethercat.h"
+#include "e1000_regs-6.4-ethercat.h"
+#include "e1000_defines-6.4-ethercat.h"
 
 struct e1000_hw;
 
@@ -287,10 +287,10 @@ struct e1000_host_mng_command_info {
 	u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];
 };
 
-#include "e1000_mac-6.1-ethercat.h"
-#include "e1000_phy-6.1-ethercat.h"
-#include "e1000_nvm-6.1-ethercat.h"
-#include "e1000_mbx-6.1-ethercat.h"
+#include "e1000_mac-6.4-ethercat.h"
+#include "e1000_phy-6.4-ethercat.h"
+#include "e1000_nvm-6.4-ethercat.h"
+#include "e1000_mbx-6.4-ethercat.h"
 
 struct e1000_mac_operations {
 	s32 (*check_for_link)(struct e1000_hw *);
diff --git a/devices/igb/e1000_i210-6.4-ethercat.c b/devices/igb/e1000_i210-6.4-ethercat.c
index a1ef702e..9a694448 100644
--- a/devices/igb/e1000_i210-6.4-ethercat.c
+++ b/devices/igb/e1000_i210-6.4-ethercat.c
@@ -8,8 +8,8 @@
 #include <linux/types.h>
 #include <linux/if_ether.h>
 
-#include "e1000_hw-6.1-ethercat.h"
-#include "e1000_i210-6.1-ethercat.h"
+#include "e1000_hw-6.4-ethercat.h"
+#include "e1000_i210-6.4-ethercat.h"
 
 static s32 igb_update_flash_i210(struct e1000_hw *hw);
 
diff --git a/devices/igb/e1000_mac-6.4-ethercat.c b/devices/igb/e1000_mac-6.4-ethercat.c
index c48b4161..9f802ab9 100644
--- a/devices/igb/e1000_mac-6.4-ethercat.c
+++ b/devices/igb/e1000_mac-6.4-ethercat.c
@@ -7,9 +7,9 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 
-#include "e1000_mac-6.1-ethercat.h"
+#include "e1000_mac-6.4-ethercat.h"
 
-#include "igb-6.1-ethercat.h"
+#include "igb-6.4-ethercat.h"
 
 static s32 igb_set_default_fc(struct e1000_hw *hw);
 static void igb_set_fc_watermarks(struct e1000_hw *hw);
diff --git a/devices/igb/e1000_mac-6.4-ethercat.h b/devices/igb/e1000_mac-6.4-ethercat.h
index d5af6c91..c2466bfc 100644
--- a/devices/igb/e1000_mac-6.4-ethercat.h
+++ b/devices/igb/e1000_mac-6.4-ethercat.h
@@ -4,12 +4,12 @@
 #ifndef _E1000_MAC_H_
 #define _E1000_MAC_H_
 
-#include "e1000_hw-6.1-ethercat.h"
+#include "e1000_hw-6.4-ethercat.h"
 
-#include "e1000_phy-6.1-ethercat.h"
-#include "e1000_nvm-6.1-ethercat.h"
-#include "e1000_defines-6.1-ethercat.h"
-#include "e1000_i210-6.1-ethercat.h"
+#include "e1000_phy-6.4-ethercat.h"
+#include "e1000_nvm-6.4-ethercat.h"
+#include "e1000_defines-6.4-ethercat.h"
+#include "e1000_i210-6.4-ethercat.h"
 
 /* Functions that should not be called directly from drivers but can be used
  * by other files in this 'shared code'
diff --git a/devices/igb/e1000_mbx-6.4-ethercat.c b/devices/igb/e1000_mbx-6.4-ethercat.c
index c579beea..0b322d2d 100644
--- a/devices/igb/e1000_mbx-6.4-ethercat.c
+++ b/devices/igb/e1000_mbx-6.4-ethercat.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2007 - 2018 Intel Corporation. */
 
-#include "e1000_mbx-6.1-ethercat.h"
+#include "e1000_mbx-6.4-ethercat.h"
 
 /**
  *  igb_read_mbx - Reads a message from the mailbox
diff --git a/devices/igb/e1000_mbx-6.4-ethercat.h b/devices/igb/e1000_mbx-6.4-ethercat.h
index 65f09fb1..9d48d9ae 100644
--- a/devices/igb/e1000_mbx-6.4-ethercat.h
+++ b/devices/igb/e1000_mbx-6.4-ethercat.h
@@ -4,7 +4,7 @@
 #ifndef _E1000_MBX_H_
 #define _E1000_MBX_H_
 
-#include "e1000_hw-6.1-ethercat.h"
+#include "e1000_hw-6.4-ethercat.h"
 
 #define E1000_P2VMAILBOX_STS	0x00000001 /* Initiate message send to VF */
 #define E1000_P2VMAILBOX_ACK	0x00000002 /* Ack message recv'd from VF */
diff --git a/devices/igb/e1000_nvm-6.4-ethercat.c b/devices/igb/e1000_nvm-6.4-ethercat.c
index 54f5e155..82cadbda 100644
--- a/devices/igb/e1000_nvm-6.4-ethercat.c
+++ b/devices/igb/e1000_nvm-6.4-ethercat.c
@@ -4,8 +4,8 @@
 #include <linux/if_ether.h>
 #include <linux/delay.h>
 
-#include "e1000_mac-6.1-ethercat.h"
-#include "e1000_nvm-6.1-ethercat.h"
+#include "e1000_mac-6.4-ethercat.h"
+#include "e1000_nvm-6.4-ethercat.h"
 
 /**
  *  igb_raise_eec_clk - Raise EEPROM clock
diff --git a/devices/igb/e1000_phy-6.4-ethercat.c b/devices/igb/e1000_phy-6.4-ethercat.c
index 561e892a..81e81c0f 100644
--- a/devices/igb/e1000_phy-6.4-ethercat.c
+++ b/devices/igb/e1000_phy-6.4-ethercat.c
@@ -4,8 +4,8 @@
 #include <linux/if_ether.h>
 #include <linux/delay.h>
 
-#include "e1000_mac-6.1-ethercat.h"
-#include "e1000_phy-6.1-ethercat.h"
+#include "e1000_mac-6.4-ethercat.h"
+#include "e1000_phy-6.4-ethercat.h"
 
 static s32  igb_phy_setup_autoneg(struct e1000_hw *hw);
 static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw,
diff --git a/devices/igb/igb-6.4-ethercat.h b/devices/igb/igb-6.4-ethercat.h
index 8ed16222..dc9afdc2 100644
--- a/devices/igb/igb-6.4-ethercat.h
+++ b/devices/igb/igb-6.4-ethercat.h
@@ -6,8 +6,8 @@
 #ifndef _IGB_H_
 #define _IGB_H_
 
-#include "e1000_mac-6.1-ethercat.h"
-#include "e1000_82575-6.1-ethercat.h"
+#include "e1000_mac-6.4-ethercat.h"
+#include "e1000_82575-6.4-ethercat.h"
 
 #include <linux/timecounter.h>
 #include <linux/net_tstamp.h>
diff --git a/devices/igb/igb_ethtool-6.4-ethercat.c b/devices/igb/igb_ethtool-6.4-ethercat.c
index 42bc6496..7c892048 100644
--- a/devices/igb/igb_ethtool-6.4-ethercat.c
+++ b/devices/igb/igb_ethtool-6.4-ethercat.c
@@ -16,7 +16,7 @@
 #include <linux/highmem.h>
 #include <linux/mdio.h>
 
-#include "igb-6.1-ethercat.h"
+#include "igb-6.4-ethercat.h"
 
 struct igb_stats {
 	char stat_string[ETH_GSTRING_LEN];
diff --git a/devices/igb/igb_hwmon-6.4-ethercat.c b/devices/igb/igb_hwmon-6.4-ethercat.c
index c759d408..d3bb6aa2 100644
--- a/devices/igb/igb_hwmon-6.4-ethercat.c
+++ b/devices/igb/igb_hwmon-6.4-ethercat.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2007 - 2018 Intel Corporation. */
 
-#include "igb-6.1-ethercat.h"
-#include "e1000_82575-6.1-ethercat.h"
-#include "e1000_hw-6.1-ethercat.h"
+#include "igb-6.4-ethercat.h"
+#include "e1000_82575-6.4-ethercat.h"
+#include "e1000_hw-6.4-ethercat.h"
 
 #include <linux/module.h>
 #include <linux/types.h>
diff --git a/devices/igb/igb_main-6.4-ethercat.c b/devices/igb/igb_main-6.4-ethercat.c
index e86b45df..efad7c2a 100644
--- a/devices/igb/igb_main-6.4-ethercat.c
+++ b/devices/igb/igb_main-6.4-ethercat.c
@@ -37,7 +37,7 @@
 #include <linux/dca.h>
 #endif
 #include <linux/i2c.h>
-#include "igb-6.1-ethercat.h"
+#include "igb-6.4-ethercat.h"
 
 enum queue_mode {
 	QUEUE_MODE_STRICT_PRIORITY,
diff --git a/devices/igb/igb_ptp-6.4-ethercat.c b/devices/igb/igb_ptp-6.4-ethercat.c
index 9e148f9a..336cea92 100644
--- a/devices/igb/igb_ptp-6.4-ethercat.c
+++ b/devices/igb/igb_ptp-6.4-ethercat.c
@@ -6,7 +6,7 @@
 #include <linux/pci.h>
 #include <linux/ptp_classify.h>
 
-#include "igb-6.1-ethercat.h"
+#include "igb-6.4-ethercat.h"
 
 #define INCVALUE_MASK		0x7fffffff
 #define ISGN			0x80000000