diff --git a/.gitignore b/.gitignore
index ca7106d..ffd2d94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ imgui.ini
 .*.d
 .vim.local/data/*
 .vim.local/signature
-output/
+build/
diff --git a/.vim.local/ycm_extra_conf.py b/.vim.local/ycm_extra_conf.py
index 4b7d666..ed26144 100644
--- a/.vim.local/ycm_extra_conf.py
+++ b/.vim.local/ycm_extra_conf.py
@@ -45,7 +45,7 @@ flags = [
     '-x',
     'c++',
     '-I','.',
-    '-I','output',
+    '-I','build',
     '-I','IconFontCppHeaders',
     '-I','imgui',
     '-I','glm',
diff --git a/Makefile b/Makefile
index 10c358b..13a3e3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-OUTDIR = output
+OUTDIR = build
 
 CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall -g
 CFLAGS += $(shell sdl2-config --cflags)
@@ -80,11 +80,11 @@ parsercheck: $(LIBEBCL) $(PARSERCHECK_BUILD)
 		$(PARSERCHECK_BUILD) $(LIBS)
 
 clean:
-	rm -f $(ALL_OBJS) $(FILEDUMPS) demo parsercheck $(PCH)
+	rm -f $(ALL_OBJS) $(FILEDUMPS) demo parsercheck $(PCH) $(OUTDIR)/font-awesome.inl
 
 fullclean: clean
 	@+make -C ebcl fullclean CONFIG=../ebcl-config
-	rm -f $(ALL_DEPS)
+	rm -f $(ALL_DEPS) $(OUTDIR)/font-to-c
 
 .PHONY: all clean fullclean
 
diff --git a/ebcl-config b/ebcl-config
index c1f8a13..99fd163 100644
--- a/ebcl-config
+++ b/ebcl-config
@@ -6,7 +6,7 @@ DEBUG = n
 OPTIMIZE = y
 BUILD_TESTS = n
 
-OUTDIR = ../output/ebcl
+OUTDIR = ../build/ebcl
 
 export BUILD_STATIC_LIB BUILD_DYNAMIC_LIB DEBUG OPTIMIZE BUILD_TESTS
 export OUTDIR