diff --git a/lib/Makefile b/lib/Makefile
index f818b29b..0dfbcd0a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -32,12 +32,15 @@ LIBFETCH_INCS = fetch/common.h
 LIBFETCH_GEN = fetch/ftperr.h fetch/httperr.h
 
 # libxbps
-OBJS = configure.o config_files.o cmpver.o download.o fexec.o
-OBJS += humanize_number.o orphans.o plist.o purge.o register.o
-OBJS += regpkgs_dictionary.o remove.o remove_obsoletes.o repository.o
-OBJS += repository_finddeps.o repository_findpkg.o repository_plist.o
-OBJS += repository_pool.o repository_sync_index.o requiredby.o
-OBJS += sortdeps.o state.o unpack.o util.o pkgmatch.o mkpath.o
+OBJS = package_configure.o package_config_files.o package_orphans.o
+OBJS += package_orphans.o package_configure.o package_purge.o
+OBJS += package_remove.o package_remove_obsoletes.o package_state.o
+OBJS += package_unpack.o package_requiredby.o package_register.o
+OBJS += cmpver.o download.o fexec.o humanize_number.o plist.o
+OBJS += sortdeps.o util.o pkgmatch.o mkpath.o
+OBJS += regpkgs_dictionary.o repository.o repository_finddeps.o
+OBJS += repository_findpkg.o repository_plist.o
+OBJS += repository_pool.o repository_sync_index.o
 OBJS += $(COMPAT_SRCS)
 
 .PHONY: all
diff --git a/lib/config_files.c b/lib/package_config_files.c
similarity index 100%
rename from lib/config_files.c
rename to lib/package_config_files.c
diff --git a/lib/configure.c b/lib/package_configure.c
similarity index 100%
rename from lib/configure.c
rename to lib/package_configure.c
diff --git a/lib/orphans.c b/lib/package_orphans.c
similarity index 100%
rename from lib/orphans.c
rename to lib/package_orphans.c
diff --git a/lib/purge.c b/lib/package_purge.c
similarity index 100%
rename from lib/purge.c
rename to lib/package_purge.c
diff --git a/lib/register.c b/lib/package_register.c
similarity index 100%
rename from lib/register.c
rename to lib/package_register.c
diff --git a/lib/remove.c b/lib/package_remove.c
similarity index 100%
rename from lib/remove.c
rename to lib/package_remove.c
diff --git a/lib/remove_obsoletes.c b/lib/package_remove_obsoletes.c
similarity index 100%
rename from lib/remove_obsoletes.c
rename to lib/package_remove_obsoletes.c
diff --git a/lib/requiredby.c b/lib/package_requiredby.c
similarity index 100%
rename from lib/requiredby.c
rename to lib/package_requiredby.c
diff --git a/lib/state.c b/lib/package_state.c
similarity index 100%
rename from lib/state.c
rename to lib/package_state.c
diff --git a/lib/unpack.c b/lib/package_unpack.c
similarity index 100%
rename from lib/unpack.c
rename to lib/package_unpack.c