diff --git a/Common/ColorConv.h b/Common/ColorConv.h
index 731866f87..220cc2bf1 100644
--- a/Common/ColorConv.h
+++ b/Common/ColorConv.h
@@ -35,7 +35,7 @@ inline u8 Convert6To8(u8 v) {
 	return (v << 2) | (v >> 4);
 }
 
-inline u32 DecodeRGBA4444(u16 src) {
+inline u32 RGBA4444ToRGBA8888(u16 src) {
 	const u32 r = (src & 0x000F) << 0;
 	const u32 g = (src & 0x00F0) << 4;
 	const u32 b = (src & 0x0F00) << 8;
@@ -45,7 +45,7 @@ inline u32 DecodeRGBA4444(u16 src) {
 	return c | (c << 4);
 }
 
-inline u32 DecodeRGBA5551(u16 src) {
+inline u32 RGBA5551ToRGBA8888(u16 src) {
 	u8 r = Convert5To8((src >> 0) & 0x1F);
 	u8 g = Convert5To8((src >> 5) & 0x1F);
 	u8 b = Convert5To8((src >> 10) & 0x1F);
@@ -54,7 +54,7 @@ inline u32 DecodeRGBA5551(u16 src) {
 	return (a << 24) | (b << 16) | (g << 8) | r;
 }
 
-inline u32 DecodeRGB565(u16 src) {
+inline u32 RGB565ToRGBA8888(u16 src) {
 	u8 r = Convert5To8((src >> 0) & 0x1F);
 	u8 g = Convert6To8((src >> 5) & 0x3F);
 	u8 b = Convert5To8((src >> 11) & 0x1F);
@@ -62,7 +62,7 @@ inline u32 DecodeRGB565(u16 src) {
 	return (a << 24) | (b << 16) | (g << 8) | r;
 }
 
-inline u16 RGBA8888To565(u32 value) {
+inline u16 RGBA8888ToRGB565(u32 value) {
 	u8 r = value & 0xFF;
 	u8 g = (value >> 8) & 0xFF;
 	u8 b = (value >> 16) & 0xFF;
@@ -72,7 +72,7 @@ inline u16 RGBA8888To565(u32 value) {
 	return (u16)r | ((u16)g << 5) | ((u16)b << 11);
 }
 
-inline u16 RGBA8888To5551(u32 value) {
+inline u16 RGBA8888ToRGBA5551(u32 value) {
 	u8 r = value & 0xFF;
 	u8 g = (value >> 8) & 0xFF;
 	u8 b = (value >> 16) & 0xFF;
@@ -84,7 +84,7 @@ inline u16 RGBA8888To5551(u32 value) {
 	return (u16)r | ((u16)g << 5) | ((u16)b << 10) | ((u16)a << 15);
 }
 
-inline u16 RGBA8888To4444(u32 value) {
+inline u16 RGBA8888ToRGBA4444(u32 value) {
 	const u32 c = value >> 4;
 	const u16 r = (c >> 0) & 0x000F;
 	const u16 g = (c >> 4) & 0x00F0;
diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp
index 33cc5a526..395114470 100644
--- a/GPU/Software/Rasterizer.cpp
+++ b/GPU/Software/Rasterizer.cpp
@@ -85,13 +85,13 @@ static inline u32 LookupColor(unsigned int index, unsigned int level)
 
 	switch (gstate.getClutPaletteFormat()) {
 	case GE_CMODE_16BIT_BGR5650:
-		return DecodeRGB565(reinterpret_cast<u16*>(clut)[index + clutSharingOffset]);
+		return RGB565ToRGBA8888(reinterpret_cast<u16*>(clut)[index + clutSharingOffset]);
 
 	case GE_CMODE_16BIT_ABGR5551:
-		return DecodeRGBA5551(reinterpret_cast<u16*>(clut)[index + clutSharingOffset]);
+		return RGBA5551ToRGBA8888(reinterpret_cast<u16*>(clut)[index + clutSharingOffset]);
 
 	case GE_CMODE_16BIT_ABGR4444:
-		return DecodeRGBA4444(reinterpret_cast<u16*>(clut)[index + clutSharingOffset]);
+		return RGBA4444ToRGBA8888(reinterpret_cast<u16*>(clut)[index + clutSharingOffset]);
 
 	case GE_CMODE_32BIT_ABGR8888:
 		return clut[index + clutSharingOffset];
@@ -261,21 +261,21 @@ inline static Nearest4 SampleNearest(int level, int u[N], int v[N], const u8 *sr
 	case GE_TFMT_4444:
 		for (int i = 0; i < N; ++i) {
 			const u8 *src = srcptr + GetPixelDataOffset<16>(texbufwidthbits, u[i], v[i]);
-			res.v[i] = DecodeRGBA4444(*(const u16 *)src);
+			res.v[i] = RGBA4444ToRGBA8888(*(const u16 *)src);
 		}
 		return res;
 	
 	case GE_TFMT_5551:
 		for (int i = 0; i < N; ++i) {
 			const u8 *src = srcptr + GetPixelDataOffset<16>(texbufwidthbits, u[i], v[i]);
-			res.v[i] = DecodeRGBA5551(*(const u16 *)src);
+			res.v[i] = RGBA5551ToRGBA8888(*(const u16 *)src);
 		}
 		return res;
 
 	case GE_TFMT_5650:
 		for (int i = 0; i < N; ++i) {
 			const u8 *src = srcptr + GetPixelDataOffset<16>(texbufwidthbits, u[i], v[i]);
-			res.v[i] = DecodeRGB565(*(const u16 *)src);
+			res.v[i] = RGB565ToRGBA8888(*(const u16 *)src);
 		}
 		return res;
 
@@ -357,13 +357,13 @@ static inline u32 GetPixelColor(int x, int y)
 {
 	switch (gstate.FrameBufFormat()) {
 	case GE_FORMAT_565:
-		return DecodeRGB565(fb.Get16(x, y, gstate.FrameBufStride()));
+		return RGB565ToRGBA8888(fb.Get16(x, y, gstate.FrameBufStride()));
 
 	case GE_FORMAT_5551:
-		return DecodeRGBA5551(fb.Get16(x, y, gstate.FrameBufStride()));
+		return RGBA5551ToRGBA8888(fb.Get16(x, y, gstate.FrameBufStride()));
 
 	case GE_FORMAT_4444:
-		return DecodeRGBA4444(fb.Get16(x, y, gstate.FrameBufStride()));
+		return RGBA4444ToRGBA8888(fb.Get16(x, y, gstate.FrameBufStride()));
 
 	case GE_FORMAT_8888:
 		return fb.Get32(x, y, gstate.FrameBufStride());
@@ -378,15 +378,15 @@ static inline void SetPixelColor(int x, int y, u32 value)
 {
 	switch (gstate.FrameBufFormat()) {
 	case GE_FORMAT_565:
-		fb.Set16(x, y, gstate.FrameBufStride(), RGBA8888To565(value));
+		fb.Set16(x, y, gstate.FrameBufStride(), RGBA8888ToRGB565(value));
 		break;
 
 	case GE_FORMAT_5551:
-		fb.Set16(x, y, gstate.FrameBufStride(), RGBA8888To5551(value));
+		fb.Set16(x, y, gstate.FrameBufStride(), RGBA8888ToRGBA5551(value));
 		break;
 
 	case GE_FORMAT_4444:
-		fb.Set16(x, y, gstate.FrameBufStride(), RGBA8888To4444(value));
+		fb.Set16(x, y, gstate.FrameBufStride(), RGBA8888ToRGBA4444(value));
 		break;
 
 	case GE_FORMAT_8888:
diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp
index 405e2dc23..332de8701 100644
--- a/GPU/Software/SoftGpu.cpp
+++ b/GPU/Software/SoftGpu.cpp
@@ -214,19 +214,19 @@ void SoftGPU::CopyToCurrentFboFromDisplayRam(int srcwidth, int srcheight)
 			switch (displayFormat_) {
 			case GE_FORMAT_565:
 				for (int x = 0; x < srcwidth; ++x) {
-					buf_line[x] = DecodeRGB565(fb_line[x]);
+					buf_line[x] = RGB565ToRGBA8888(fb_line[x]);
 				}
 				break;
 
 			case GE_FORMAT_5551:
 				for (int x = 0; x < srcwidth; ++x) {
-					buf_line[x] = DecodeRGBA5551(fb_line[x]);
+					buf_line[x] = RGBA5551ToRGBA8888(fb_line[x]);
 				}
 				break;
 
 			case GE_FORMAT_4444:
 				for (int x = 0; x < srcwidth; ++x) {
-					buf_line[x] = DecodeRGBA4444(fb_line[x]);
+					buf_line[x] = RGBA4444ToRGBA8888(fb_line[x]);
 				}
 				break;