diff --git a/libs/libxx/Makefile b/libs/libxx/Makefile
index e5360c3f53..b3230c1a32 100644
--- a/libs/libxx/Makefile
+++ b/libs/libxx/Makefile
@@ -35,12 +35,6 @@
 
 -include $(TOPDIR)/Make.defs
 
-ifeq ($(CONFIG_LIBCXX),y)
-LIBXX=libcxx
-else
-LIBXX=libxx
-endif
-
 # Sources
 
 ASRCS =
@@ -93,7 +87,7 @@ CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS = $(AOBJS) $(COBJS) $(CXXOBJS)
 
-BIN = $(LIBXX)$(LIBEXT)
+BIN = libxx$(LIBEXT)
 
 all: $(BIN)
 .PHONY: depend clean distclean
diff --git a/tools/Directories.mk b/tools/Directories.mk
index 61fd385a50..9f6a437144 100644
--- a/tools/Directories.mk
+++ b/tools/Directories.mk
@@ -72,12 +72,6 @@ CLEANDIRS += $(APPDIR)
 endif
 endif
 
-ifeq ($(CONFIG_LIBCXX),y)
-LIBXX=libcxx
-else
-LIBXX=libxx
-endif
-
 KERNDEPDIRS += sched drivers boards $(ARCH_SRC)
 KERNDEPDIRS += fs binfmt
 CONTEXTDIRS = boards $(APPDIR)
diff --git a/tools/FlatLibs.mk b/tools/FlatLibs.mk
index 988bdd6635..5e115ae253 100644
--- a/tools/FlatLibs.mk
+++ b/tools/FlatLibs.mk
@@ -74,7 +74,7 @@ endif
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
+NUTTXLIBS += staging$(DELIM)libxx$(LIBEXT)
 endif
 
 # Add library for application support.
diff --git a/tools/KernelLibs.mk b/tools/KernelLibs.mk
index 575c97ca3f..16df064c73 100644
--- a/tools/KernelLibs.mk
+++ b/tools/KernelLibs.mk
@@ -63,7 +63,7 @@ USERLIBS  += staging$(DELIM)libumm$(LIBEXT) staging$(DELIM)libuarch$(LIBEXT)
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
+USERLIBS += staging$(DELIM)libxx$(LIBEXT)
 endif
 
 # Add libraries for network support
diff --git a/tools/LibTargets.mk b/tools/LibTargets.mk
index 65f2976ef4..efe304280d 100644
--- a/tools/LibTargets.mk
+++ b/tools/LibTargets.mk
@@ -188,10 +188,10 @@ $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT): context
 staging$(DELIM)libuarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT)
 	$(Q) $(call INSTALL_LIB,$<,$@)
 
-libs$(DELIM)libxx$(DELIM)$(LIBXX)$(LIBEXT): context
-	$(Q) $(MAKE) -C libs$(DELIM)libxx TOPDIR="$(TOPDIR)" $(LIBXX)$(LIBEXT) KERNEL=n
+libs$(DELIM)libxx$(DELIM)libxx$(LIBEXT): context
+	$(Q) $(MAKE) -C libs$(DELIM)libxx TOPDIR="$(TOPDIR)" libxx$(LIBEXT) KERNEL=n
 
-staging$(DELIM)$(LIBXX)$(LIBEXT): libs$(DELIM)libxx$(DELIM)$(LIBXX)$(LIBEXT)
+staging$(DELIM)libxx$(LIBEXT): libs$(DELIM)libxx$(DELIM)libxx$(LIBEXT)
 	$(Q) $(call INSTALL_LIB,$<,$@)
 
 $(APPDIR)$(DELIM)libapps$(LIBEXT): context
diff --git a/tools/ProtectedLibs.mk b/tools/ProtectedLibs.mk
index 3a1a75a9aa..8edf90a177 100644
--- a/tools/ProtectedLibs.mk
+++ b/tools/ProtectedLibs.mk
@@ -72,7 +72,7 @@ endif
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
+USERLIBS += staging$(DELIM)libxx$(LIBEXT)
 endif
 
 # Add library for application support.
diff --git a/tools/ide_exporter.py b/tools/ide_exporter.py
index baecdd2a90..2ce59766ad 100755
--- a/tools/ide_exporter.py
+++ b/tools/ide_exporter.py
@@ -955,7 +955,7 @@ if __name__ == '__main__':
             lib_prj.make_src_nodes(group_src_list)
             lib_prj.make_include(group_src_list)
             lib_prj.make_output_dir(lib_name)
-            if lib_name == 'libxx' or lib_name == 'libcxx':
+            if lib_name == 'libxx':
                 lib_prj.add_misc('cxx_misc')
                 lib_prj.add_define('cxx_def', 'CONFIG_WCHAR_BUILTIN')
             else: