diff --git a/Drivers/audio/ac97/Makefile b/Drivers/audio/ac97/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/audio/ac97/Makefile
+++ b/Drivers/audio/ac97/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/audio/hda/Makefile b/Drivers/audio/hda/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/audio/hda/Makefile
+++ b/Drivers/audio/hda/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/filesystem/fat/Makefile b/Drivers/filesystem/fat/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/filesystem/fat/Makefile
+++ b/Drivers/filesystem/fat/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/input/aip/Makefile b/Drivers/input/aip/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/input/aip/Makefile
+++ b/Drivers/input/aip/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/library/Makefile b/Drivers/library/Makefile
index 7ee6b105..b6eb37ba 100644
--- a/Drivers/library/Makefile
+++ b/Drivers/library/Makefile
@@ -5,10 +5,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./crt/*")
 C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./crt/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./crt/*")
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./crt/*")
 HEADERS = $(sort $(dir $(wildcard $(INCLUDE_DIR)/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 LDFLAGS := -fPIC -fPIE -pie -nostdlib -nodefaultlibs -nolibc	\
 	-zmax-page-size=0x1000 -Wl,-Map libkernel.map -shared
diff --git a/Drivers/misc/example/Makefile b/Drivers/misc/example/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/misc/example/Makefile
+++ b/Drivers/misc/example/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/misc/vmware/Makefile b/Drivers/misc/vmware/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/misc/vmware/Makefile
+++ b/Drivers/misc/vmware/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/network/e1000/Makefile b/Drivers/network/e1000/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/network/e1000/Makefile
+++ b/Drivers/network/e1000/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/network/rtl8139/Makefile b/Drivers/network/rtl8139/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/network/rtl8139/Makefile
+++ b/Drivers/network/rtl8139/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/storage/ahci/Makefile b/Drivers/storage/ahci/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/storage/ahci/Makefile
+++ b/Drivers/storage/ahci/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv
 
diff --git a/Drivers/storage/ata/Makefile b/Drivers/storage/ata/Makefile
index da54d9e7..9a92e2ef 100644
--- a/Drivers/storage/ata/Makefile
+++ b/Drivers/storage/ata/Makefile
@@ -3,10 +3,10 @@ default:
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
 FILENAME = $(notdir $(shell pwd)).drv