diff --git a/Makefile b/Makefile
index 5a125de..3cce5c7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 # `make clean all` nicht mit -j verwenden! -> race condition im make file
 # statdessen: `make clean; make all -j` verwenden
 
-NAME = libmrbesen.so
-NAMEINC = mrbesen
+NAMESHORT = mrbesen
+NAME = lib$(NAMESHORT).so
 NAMETEST = test
 CFLAGS = -fpic -std=c++17 -O2 -g -pipe -Wall -Wextra -Wno-unused-parameter -Wpedantic
 CXX = g++
@@ -15,6 +15,7 @@ BUILDDIR = build/
 INCF = inc/
 TESTF = tests/
 DEPF = $(BUILDDIR)deps/
+OUTF = ./
 
 INCLUDES = -I$(INCF)
 LDFLAGS = 
@@ -28,11 +29,11 @@ BUILDDIRS = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(SOURCEDIRS))
 
 INCLUDES += $(addprefix -I, $(SOURCEDIRS))
 
-all: $(NAME) runtest
+all: $(OUTF)$(NAME) runtest
 
-$(NAME): $(BUILDDIRS) $(DEPF) $(OBJFILES)
+$(OUTF)$(NAME): $(BUILDDIRS) $(DEPF) $(OBJFILES)
 	@echo "Linking $@"
-	@$(LD) -shared -o $@ $(filter %.o, $^)
+	@$(CXX) -shared -o $@ $(filter %.o, $^)
 
 $(BUILDDIR)%.o: $(SRCF)%.cpp
 	@echo "Compiling: $@"
@@ -46,24 +47,24 @@ clean-depends:
 	$(RM) -r $(DEPF)
 
 clean:
-	$(RM) -r $(NAME) $(BUILDDIR) $(NAMETEST)
+	$(RM) -r $(OUTF)$(NAME) $(BUILDDIR) $(NAMETEST)
 
 $(NAMETEST): $(NAME) $(TESTF)*.cpp
 	@echo "Compiling tests"
-	@$(CXX) -o $@ $(filter-out %.so, $^) $(CFLAGS) $(INCLUDES) $(LDFLAGS) -L./ -lmrbesen
+	@$(CXX) -o $@ $(filter-out %.so, $^) $(CFLAGS) $(INCLUDES) $(LDFLAGS) -L$(OUTF) -l$(NAMESHORT)
 
 runtest: $(NAMETEST)
 	@echo "Running tests"
-	LD_LIBRARY_PATH=./:$(LD_LIBRARY_PATH) ./$<
+	LD_LIBRARY_PATH=$(OUTF):$(LD_LIBRARY_PATH) ./$<
 
 install: $(NAME)
 	cp -f ./$(NAME) /usr/lib/
 	mkdir -p /usr/include/$(NAMEINC)/
-	cp -rf $(INCF)* /usr/include/$(NAMEINC)/
+	cp -rf $(INCF)* /usr/include/$(NAMESHORT)/
 
 uninstall:
-	$(RM) -r /usr/lib/$(NAME) /usr/include/$(NAMEINC)/
+	$(RM) -r /usr/lib/$(NAME) /usr/include/$(NAMESHORT)/
 
-.PHONY: clean all $(NAMETEST) clean-depends runtest install
+.PHONY: clean all clean-depends runtest install uninstall
 
 include $(DEPFILES)