diff --git a/Makefile b/Makefile
index a1be4242378fdc7424591dc8532af10ab6739012..9cf5166039c127af89403f2db5b85eaac8feb84d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@ include config.mk
 include platform.mk
 
 # Targets
-all: info libkresolve modules kresolved
-install: libkresolve-install modules-install kresolved-install
+all: info lib modules daemon
+install: lib-install modules-install daemon-install
 check: all tests
-clean: libkresolve-clean modules-clean kresolved-clean tests-clean doc-clean
+clean: lib-clean modules-clean daemon-clean tests-clean doc-clean
 doc: doc-html
 .PHONY: all install check clean doc
 
@@ -26,8 +26,8 @@ CFLAGS += $(libknot_CFLAGS) $(libuv_CFLAGS) $(cmocka_CFLAGS) $(python_CFLAGS)
 
 # Sub-targets
 include help.mk
-include lib/libkresolve.mk
-include daemon/kresolved.mk
+include lib/lib.mk
+include daemon/daemon.mk
 include modules/modules.mk
 include tests/tests.mk
 include doc/doc.mk
diff --git a/daemon/kresolved.mk b/daemon/daemon.mk
similarity index 78%
rename from daemon/kresolved.mk
rename to daemon/daemon.mk
index 7e9347d7f0f0ce186a7295de9f182a38b5a28824..532ac36a91de898374b66636c5b9a83fbcc78265 100644
--- a/daemon/kresolved.mk
+++ b/daemon/daemon.mk
@@ -12,3 +12,8 @@ kresolved_LIBS := $(libkresolve_TARGET) $(libknot_LIBS) $(libuv_LIBS)
 
 # Make binary
 $(eval $(call make_bin,kresolved,daemon))
+
+# Targets
+daemon: kresolved
+daemon-install: kresolved-install
+daemon-clean: kresolved-clean
diff --git a/lib/libkresolve.mk b/lib/lib.mk
similarity index 83%
rename from lib/libkresolve.mk
rename to lib/lib.mk
index 4955b2589fcd75a2f6aed1e7fa3b2d6866380f02..50aa2a60ce35ca1a55804ffb55e16999e2e03ae1 100644
--- a/lib/libkresolve.mk
+++ b/lib/lib.mk
@@ -27,4 +27,9 @@ libkresolve_LIBS := $(libknot_LIBS)
 libkresolve_TARGET := -Wl,-rpath,lib -Llib -lkresolve
 
 # Make library
-$(eval $(call make_lib,libkresolve,lib))
\ No newline at end of file
+$(eval $(call make_lib,libkresolve,lib))
+
+# Targets
+lib: libkresolve
+lib-install: libkresolve-install
+lib-clean: libkresolve-clean