diff --git a/keywords.txt b/keywords.txt
index c901108..6c442ba 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -659,14 +659,14 @@ DotStarSpi2MhzMethod	KEYWORD1
 DotStarSpi1MhzMethod	KEYWORD1
 DotStarSpi500KhzMethod	KEYWORD1
 DotStarSpiHzMethod	KEYWORD1
-NeoWs2801Method	KEYWORD1
-NeoWs2801SpiMethod	KEYWORD1
-NeoWs2801Spi20MhzMethod	KEYWORD1
-NeoWs2801Spi10MhzMethod	KEYWORD1
-NeoWs2801Spi2MhzMethod	KEYWORD1
-NeoWs2801Spi1MhzMethod	KEYWORD1
-NeoWs2801Spi500KhzMethod	KEYWORD1
-NeoWs2801SpiHzMethod	KEYWORD1
+Ws2801Method	KEYWORD1
+Ws2801SpiMethod	KEYWORD1
+Ws2801Spi20MhzMethod	KEYWORD1
+Ws2801Spi10MhzMethod	KEYWORD1
+Ws2801Spi2MhzMethod	KEYWORD1
+Ws2801Spi1MhzMethod	KEYWORD1
+Ws2801Spi500KhzMethod	KEYWORD1
+Ws2801SpiHzMethod	KEYWORD1
 Lpd6803SpiMethod	KEYWORD1
 Lpd6803Method	KEYWORD1
 Lpd6803Spi20MhzMethod	KEYWORD1
diff --git a/src/internal/DotStarGenericMethod.h b/src/internal/DotStarGenericMethod.h
index cdb3f2c..5470864 100644
--- a/src/internal/DotStarGenericMethod.h
+++ b/src/internal/DotStarGenericMethod.h
@@ -151,26 +151,26 @@ typedef DotStarSpi10MhzMethod DotStarSpiMethod;
 
 #if defined(ARDUINO_ARCH_ESP32)
 // Give option to use Vspi alias of Spi class if wanting to specify which SPI peripheral is used on the ESP32
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed40Mhz>> DotStarVspi40MhzMethod;
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed20Mhz>> DotStarVspi20MhzMethod;
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed10Mhz>> DotStarVspi10MhzMethod;
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed5Mhz>> DotStarVspi5MhzMethod;
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed2Mhz>> DotStarVspi2MhzMethod;
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed1Mhz>> DotStarVspi1MhzMethod;
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed500Khz>> DotStarVspi500KhzMethod;
-typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeedHz>> DotStarVspiHzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed40Mhz>> DotStarEsp32Vspi40MhzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed20Mhz>> DotStarEsp32Vspi20MhzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed10Mhz>> DotStarEsp32Vspi10MhzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed5Mhz>> DotStarEsp32Vspi5MhzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed2Mhz>> DotStarEsp32Vspi2MhzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed1Mhz>> DotStarEsp32Vspi1MhzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed500Khz>> DotStarEsp32Vspi500KhzMethod;
+typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeedHz>> DotStarEsp32VspiHzMethod;
 
-typedef DotStarSpi10MhzMethod DotStarVspiMethod;
+typedef DotStarSpi10MhzMethod DotStarEsp32VspiMethod;
 
 #include "TwoWireHspiImple.h"
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed40Mhz>> DotStarHspi40MhzMethod;
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed20Mhz>> DotStarHspi20MhzMethod;
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed10Mhz>> DotStarHspi10MhzMethod;
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed5Mhz>> DotStarHspi5MhzMethod;
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed2Mhz>> DotStarHspi2MhzMethod;
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed1Mhz>> DotStarHspi1MhzMethod;
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed500Khz>> DotStarHspi500KhzMethod;
-typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeedHz>> DotStarHspiHzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed40Mhz>> DotStarEsp32Hspi40MhzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed20Mhz>> DotStarEsp32Hspi20MhzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed10Mhz>> DotStarEsp32Hspi10MhzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed5Mhz>> DotStarEsp32Hspi5MhzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed2Mhz>> DotStarEsp32Hspi2MhzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed1Mhz>> DotStarEsp32Hspi1MhzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeed500Khz>> DotStarEsp32Hspi500KhzMethod;
+typedef DotStarMethodBase<TwoWireHspiImple<SpiSpeedHz>> DotStarEsp32HspiHzMethod;
 
-typedef DotStarHspi10MhzMethod DotStarHspiMethod;
+typedef DotStarEsp32Hspi10MhzMethod DotStarEsp32HspiMethod;
 #endif
diff --git a/src/internal/Ws2801GenericMethod.h b/src/internal/Ws2801GenericMethod.h
index 9b4ebf7..4eb8957 100644
--- a/src/internal/Ws2801GenericMethod.h
+++ b/src/internal/Ws2801GenericMethod.h
@@ -131,20 +131,20 @@ private:
     uint8_t* _data;       // Holds LED color values
 };
 
-typedef Ws2801MethodBase<TwoWireBitBangImple> NeoWs2801Method;
+typedef Ws2801MethodBase<TwoWireBitBangImple> Ws2801Method;
 
 #if !defined(__AVR_ATtiny85__) && !defined(ARDUINO_attiny)
 #include "TwoWireSpiImple.h"
-typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed20Mhz>> NeoWs2801Spi20MhzMethod;
-typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed10Mhz>> NeoWs2801Spi10MhzMethod;
-typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed5Mhz>> NeoWs2801Spi5MhzMethod;
-typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed2Mhz>> NeoWs2801Spi2MhzMethod;
-typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed1Mhz>> NeoWs2801Spi1MhzMethod;
-typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed500Khz>> NeoWs2801Spi500KhzMethod;
+typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed20Mhz>> Ws2801Spi20MhzMethod;
+typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed10Mhz>> Ws2801Spi10MhzMethod;
+typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed5Mhz>> Ws2801Spi5MhzMethod;
+typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed2Mhz>> Ws2801Spi2MhzMethod;
+typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed1Mhz>> Ws2801Spi1MhzMethod;
+typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeed500Khz>> Ws2801Spi500KhzMethod;
 
-typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeedHz>> NeoWs2801SpiHzMethod;
+typedef Ws2801MethodBase<TwoWireSpiImple<SpiSpeedHz>> Ws2801SpiHzMethod;
 
-typedef NeoWs2801Spi10MhzMethod NeoWs2801SpiMethod;
+typedef Ws2801Spi10MhzMethod Ws2801SpiMethod;
 #endif