diff --git a/Makefile b/Makefile
index 450d467..63dbcbc 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,8 @@ $(kernel): $(assembly_object_files) $(crystal_os) $(linker_script) $(crystal_fil
 				@echo Creating $@...
 				@mkdir -p $(shell dirname $(crystal_os))
 				@crystal build src/main.cr --target=$(target) --prelude=empty --emit=obj --verbose
-				@mv -f main.o main target/$(target)/debug/
+				@rm main
+				@mv -f main.o target/$(target)/debug/
 				@ld -n -nostdlib -melf_x86_64 --gc-sections --build-id=none -T $(linker_script) -o $@ $(assembly_object_files) $(crystal_os) $(libcr)
 
 build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm
diff --git a/spec/libcr_spec.cr b/spec/lib_cr/string_spec.cr
similarity index 95%
rename from spec/libcr_spec.cr
rename to spec/lib_cr/string_spec.cr
index b31ad60..3a3144d 100644
--- a/spec/libcr_spec.cr
+++ b/spec/lib_cr/string_spec.cr
@@ -7,8 +7,8 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-require "./spec_helper"
-require "../src/lib_cr/libcr"
+require "../spec_helper"
+require "../../src/lib_cr/string"
 
 describe "LibCR" do
   context "memcmp" do
diff --git a/src/lib_cr/libcr.cr b/src/lib_cr/string.cr
similarity index 100%
rename from src/lib_cr/libcr.cr
rename to src/lib_cr/string.cr
diff --git a/src/main.cr b/src/main.cr
index 43165de..6bcbd25 100644
--- a/src/main.cr
+++ b/src/main.cr
@@ -8,7 +8,7 @@
 # except according to those terms.
 
 require "./arch/x86_64/scrn"
-require "./lib_cr/libcr"
+require "./lib_cr/string"
 
 puts
 puts "Hello World from Crystal!!!"