71 files changed, 7 insertions, 7 deletions
diff --git a/src/libsystemd-bus/.gitignore b/src/libsystemd/.gitignore
index fcfd804516..613b05c873 100644
--- a/src/libsystemd-bus/.gitignore
+++ b/src/libsystemd/.gitignore
@@ -1,2 +1,2 @@
-/libsystemd-bus.pc
+/libsystemd.pc
 /bus-error-mapping.c
diff --git a/src/libsystemd-bus/DIFFERENCES b/src/libsystemd/DIFFERENCES
index d60ac10914..fd7506b993 100644
--- a/src/libsystemd-bus/DIFFERENCES
+++ b/src/libsystemd/DIFFERENCES
@@ -1,8 +1,8 @@
 Known differences between dbus1 and kdbus:
 
 - NameAcquired/NameLost is gone entirely on kdbus backends if
-  libsystemd-bus is used. It is still added in by systemd-bus-proxyd
-  for old dbus1 clients, and it is available if libsystemd-bus is used
+  libsystemd is used. It is still added in by systemd-bus-proxyd
+  for old dbus1 clients, and it is available if libsystemd is used
   against the classic dbus1 daemon. If you want to write compatible
   code with libsystem-bus you need to explicitly subscribe to
   NameOwnerChanged signals and just ignore NameAcquired/NameLost
diff --git a/src/libsystemd-bus/GVARIANT-SERIALIZATION b/src/libsystemd/GVARIANT-SERIALIZATION
index 5dffc25bb3..5dffc25bb3 100644
--- a/src/libsystemd-bus/GVARIANT-SERIALIZATION
+++ b/src/libsystemd/GVARIANT-SERIALIZATION
diff --git a/src/libsystemd-bus/Makefile b/src/libsystemd/Makefile
index d0b0e8e008..d0b0e8e008 120000
--- a/src/libsystemd-bus/Makefile
+++ b/src/libsystemd/Makefile
diff --git a/src/libsystemd-bus/PORTING-DBUS1 b/src/libsystemd/PORTING-DBUS1
index d14d6286a2..67af27772e 100644
--- a/src/libsystemd-bus/PORTING-DBUS1
+++ b/src/libsystemd/PORTING-DBUS1
@@ -21,7 +21,7 @@ bus. The system bus is thus called /dev/kdbus/0-system, and for user
 buses the device node is /dev/kdbus/1000-user (if 1000 is your user
 id).
 
-(Before we proceed, please always keep a copy of libsystemd-bus next
+(Before we proceed, please always keep a copy of libsystemd next
 to you, ultimately that's where the details are, this document simply
 is a rough overview to help you grok things.)
 
@@ -414,7 +414,7 @@ More specifically:
    there are kernel messages containing KDBUS_ITEM_NAME_ADD,
    KDBUS_ITEM_NAME_REMOVE, KDBUS_ITEM_NAME_CHANGE, KDBUS_ITEM_ID_ADD,
    KDBUS_ITEM_ID_REMOVE items are generated (each message will contain
-   exactly one of these items). Note that in libsystemd-bus we have
+   exactly one of these items). Note that in libsystemd we have
    obsoleted NameLost/NameAcquired messages, since they are entirely
    redundant to NameOwnerChanged. This library will hence only
    synthesize NameOwnerChanged messages from these kernel messages,
diff --git a/src/libsystemd-bus/bus-bloom.c b/src/libsystemd/bus-bloom.c
index 9e51334b52..9e51334b52 100644
--- a/src/libsystemd-bus/bus-bloom.c
+++ b/src/libsystemd/bus-bloom.c
diff --git a/src/libsystemd-bus/bus-bloom.h b/src/libsystemd/bus-bloom.h
index 422eb4e01a..422eb4e01a 100644
--- a/src/libsystemd-bus/bus-bloom.h
+++ b/src/libsystemd/bus-bloom.h
diff --git a/src/libsystemd-bus/bus-container.c b/src/libsystemd/bus-container.c
index d330363b6f..d330363b6f 100644
--- a/src/libsystemd-bus/bus-container.c
+++ b/src/libsystemd/bus-container.c
diff --git a/src/libsystemd-bus/bus-container.h b/src/libsystemd/bus-container.h
index c6f757a99b..c6f757a99b 100644
--- a/src/libsystemd-bus/bus-container.h
+++ b/src/libsystemd/bus-container.h
diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd/bus-control.c
index e7e9ba07b0..e7e9ba07b0 100644
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd/bus-control.c
diff --git a/src/libsystemd-bus/bus-control.h b/src/libsystemd/bus-control.h
index b610bef842..b610bef842 100644
--- a/src/libsystemd-bus/bus-control.h
+++ b/src/libsystemd/bus-control.h
diff --git a/src/libsystemd-bus/bus-convenience.c b/src/libsystemd/bus-convenience.c
index 3964960fab..3964960fab 100644
--- a/src/libsystemd-bus/bus-convenience.c
+++ b/src/libsystemd/bus-convenience.c
diff --git a/src/libsystemd-bus/bus-creds.c b/src/libsystemd/bus-creds.c
index 52e55fc5e1..52e55fc5e1 100644
--- a/src/libsystemd-bus/bus-creds.c
+++ b/src/libsystemd/bus-creds.c
diff --git a/src/libsystemd-bus/bus-creds.h b/src/libsystemd/bus-creds.h
index d8b4aca2a0..d8b4aca2a0 100644
--- a/src/libsystemd-bus/bus-creds.h
+++ b/src/libsystemd/bus-creds.h
diff --git a/src/libsystemd-bus/bus-dump.c b/src/libsystemd/bus-dump.c
index 78e7597ed5..78e7597ed5 100644
--- a/src/libsystemd-bus/bus-dump.c
+++ b/src/libsystemd/bus-dump.c
diff --git a/src/libsystemd-bus/bus-dump.h b/src/libsystemd/bus-dump.h
index bb1d25dc42..bb1d25dc42 100644
--- a/src/libsystemd-bus/bus-dump.h
+++ b/src/libsystemd/bus-dump.h
diff --git a/src/libsystemd-bus/bus-error-mapping.gperf b/src/libsystemd/bus-error-mapping.gperf
index df2c4d407d..df2c4d407d 100644
--- a/src/libsystemd-bus/bus-error-mapping.gperf
+++ b/src/libsystemd/bus-error-mapping.gperf
diff --git a/src/libsystemd-bus/bus-error.c b/src/libsystemd/bus-error.c
index c2e41fb016..c2e41fb016 100644
--- a/src/libsystemd-bus/bus-error.c
+++ b/src/libsystemd/bus-error.c
diff --git a/src/libsystemd-bus/bus-error.h b/src/libsystemd/bus-error.h
index cf0ad9d545..cf0ad9d545 100644
--- a/src/libsystemd-bus/bus-error.h
+++ b/src/libsystemd/bus-error.h
diff --git a/src/libsystemd-bus/bus-gvariant.c b/src/libsystemd/bus-gvariant.c
index dc40009925..dc40009925 100644
--- a/src/libsystemd-bus/bus-gvariant.c
+++ b/src/libsystemd/bus-gvariant.c
diff --git a/src/libsystemd-bus/bus-gvariant.h b/src/libsystemd/bus-gvariant.h
index b4bd2a50f0..b4bd2a50f0 100644
--- a/src/libsystemd-bus/bus-gvariant.h
+++ b/src/libsystemd/bus-gvariant.h
diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd/bus-internal.c
index 0bea8cac49..0bea8cac49 100644
--- a/src/libsystemd-bus/bus-internal.c
+++ b/src/libsystemd/bus-internal.c
diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd/bus-internal.h
index 7c92293771..7c92293771 100644
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd/bus-internal.h
diff --git a/src/libsystemd-bus/bus-introspect.c b/src/libsystemd/bus-introspect.c
index d528ab2a04..d528ab2a04 100644
--- a/src/libsystemd-bus/bus-introspect.c
+++ b/src/libsystemd/bus-introspect.c
diff --git a/src/libsystemd-bus/bus-introspect.h b/src/libsystemd/bus-introspect.h
index 98312d123b..98312d123b 100644
--- a/src/libsystemd-bus/bus-introspect.h
+++ b/src/libsystemd/bus-introspect.h
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd/bus-kernel.c
index e8f4c58110..e8f4c58110 100644
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd/bus-kernel.c
diff --git a/src/libsystemd-bus/bus-kernel.h b/src/libsystemd/bus-kernel.h
index 2aba0bbe0a..2aba0bbe0a 100644
--- a/src/libsystemd-bus/bus-kernel.h
+++ b/src/libsystemd/bus-kernel.h
diff --git a/src/libsystemd-bus/bus-match.c b/src/libsystemd/bus-match.c
index ffc97562fd..ffc97562fd 100644
--- a/src/libsystemd-bus/bus-match.c
+++ b/src/libsystemd/bus-match.c
diff --git a/src/libsystemd-bus/bus-match.h b/src/libsystemd/bus-match.h
index 056082b908..056082b908 100644
--- a/src/libsystemd-bus/bus-match.h
+++ b/src/libsystemd/bus-match.h
diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd/bus-message.c
index 0c8604c492..0c8604c492 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd/bus-message.c
diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd/bus-message.h
index 5322375ef1..5322375ef1 100644
--- a/src/libsystemd-bus/bus-message.h
+++ b/src/libsystemd/bus-message.h
diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd/bus-objects.c
index b116a5dd10..b116a5dd10 100644
--- a/src/libsystemd-bus/bus-objects.c
+++ b/src/libsystemd/bus-objects.c
diff --git a/src/libsystemd-bus/bus-objects.h b/src/libsystemd/bus-objects.h
index 420edd9478..420edd9478 100644
--- a/src/libsystemd-bus/bus-objects.h
+++ b/src/libsystemd/bus-objects.h
diff --git a/src/libsystemd-bus/bus-protocol.h b/src/libsystemd/bus-protocol.h
index 5046d17a10..5046d17a10 100644
--- a/src/libsystemd-bus/bus-protocol.h
+++ b/src/libsystemd/bus-protocol.h
diff --git a/src/libsystemd-bus/bus-signature.c b/src/libsystemd/bus-signature.c
index 1e5bf4821d..1e5bf4821d 100644
--- a/src/libsystemd-bus/bus-signature.c
+++ b/src/libsystemd/bus-signature.c
diff --git a/src/libsystemd-bus/bus-signature.h b/src/libsystemd/bus-signature.h
index 2e06e30548..2e06e30548 100644
--- a/src/libsystemd-bus/bus-signature.h
+++ b/src/libsystemd/bus-signature.h
diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd/bus-socket.c
index 0c4b6af447..0c4b6af447 100644
--- a/src/libsystemd-bus/bus-socket.c
+++ b/src/libsystemd/bus-socket.c
diff --git a/src/libsystemd-bus/bus-socket.h b/src/libsystemd/bus-socket.h
index 5a1c7d4cf2..5a1c7d4cf2 100644
--- a/src/libsystemd-bus/bus-socket.h
+++ b/src/libsystemd/bus-socket.h
diff --git a/src/libsystemd-bus/bus-type.c b/src/libsystemd/bus-type.c
index b7914d15d3..b7914d15d3 100644
--- a/src/libsystemd-bus/bus-type.c
+++ b/src/libsystemd/bus-type.c
diff --git a/src/libsystemd-bus/bus-type.h b/src/libsystemd/bus-type.h
index 2e423bbfdb..2e423bbfdb 100644
--- a/src/libsystemd-bus/bus-type.h
+++ b/src/libsystemd/bus-type.h
diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd/bus-util.c
index a468bcad6b..a468bcad6b 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd/bus-util.c
diff --git a/src/libsystemd-bus/bus-util.h b/src/libsystemd/bus-util.h
index 51e1613c17..51e1613c17 100644
--- a/src/libsystemd-bus/bus-util.h
+++ b/src/libsystemd/bus-util.h
diff --git a/src/libsystemd-bus/busctl.c b/src/libsystemd/busctl.c
index e962ba3f63..e962ba3f63 100644
--- a/src/libsystemd-bus/busctl.c
+++ b/src/libsystemd/busctl.c
diff --git a/src/libsystemd-bus/dns-util.h b/src/libsystemd/dns-util.h
index e0284c81b1..e0284c81b1 100644
--- a/src/libsystemd-bus/dns-util.h
+++ b/src/libsystemd/dns-util.h
diff --git a/src/libsystemd-bus/event-util.h b/src/libsystemd/event-util.h
index e58020dedf..e58020dedf 100644
--- a/src/libsystemd-bus/event-util.h
+++ b/src/libsystemd/event-util.h
diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd/kdbus.h
index c59bdd859d..c59bdd859d 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd/kdbus.h
diff --git a/src/libsystemd-bus/libsystemd-bus.pc.in b/src/libsystemd/libsystemd.pc.in
index 0a3686aa18..a687441003 100644
--- a/src/libsystemd-bus/libsystemd-bus.pc.in
+++ b/src/libsystemd/libsystemd.pc.in
@@ -11,9 +11,9 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: systemd
-Description: systemd Bus and Event Loop Library
+Description: systemd Library
 URL: @PACKAGE_URL@
 Version: @PACKAGE_VERSION@
 Requires: libsystemd-id128 = @PACKAGE_VERSION@
-Libs: -L${libdir} -lsystemd-bus
+Libs: -L${libdir} -lsystemd
 Cflags: -I${includedir}
diff --git a/src/libsystemd-bus/libsystemd-bus.sym b/src/libsystemd/libsystemd.sym
index 1fb669085c..1fb669085c 100644
--- a/src/libsystemd-bus/libsystemd-bus.sym
+++ b/src/libsystemd/libsystemd.sym
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd/sd-bus.c
index 6bd1eaa81b..6bd1eaa81b 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus.c
diff --git a/src/libsystemd-bus/sd-dns.c b/src/libsystemd/sd-dns.c
index 0f90d020ad..0f90d020ad 100644
--- a/src/libsystemd-bus/sd-dns.c
+++ b/src/libsystemd/sd-dns.c
diff --git a/src/libsystemd-bus/sd-event.c b/src/libsystemd/sd-event.c
index 0b7b71d16e..0b7b71d16e 100644
--- a/src/libsystemd-bus/sd-event.c
+++ b/src/libsystemd/sd-event.c
diff --git a/src/libsystemd-bus/sd-memfd.c b/src/libsystemd/sd-memfd.c
index cd95978ac2..cd95978ac2 100644
--- a/src/libsystemd-bus/sd-memfd.c
+++ b/src/libsystemd/sd-memfd.c
diff --git a/src/libsystemd-bus/sd-utf8.c b/src/libsystemd/sd-utf8.c
index 6f2aa6064c..6f2aa6064c 100644
--- a/src/libsystemd-bus/sd-utf8.c
+++ b/src/libsystemd/sd-utf8.c
diff --git a/src/libsystemd-bus/test-bus-chat.c b/src/libsystemd/test-bus-chat.c
index 021379f0b0..021379f0b0 100644
--- a/src/libsystemd-bus/test-bus-chat.c
+++ b/src/libsystemd/test-bus-chat.c
diff --git a/src/libsystemd-bus/test-bus-cleanup.c b/src/libsystemd/test-bus-cleanup.c
index d8ddb8452e..d8ddb8452e 100644
--- a/src/libsystemd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/test-bus-cleanup.c
diff --git a/src/libsystemd-bus/test-bus-creds.c b/src/libsystemd/test-bus-creds.c
index 966b84c39e..966b84c39e 100644
--- a/src/libsystemd-bus/test-bus-creds.c
+++ b/src/libsystemd/test-bus-creds.c
diff --git a/src/libsystemd-bus/test-bus-error.c b/src/libsystemd/test-bus-error.c
index b78be5499c..b78be5499c 100644
--- a/src/libsystemd-bus/test-bus-error.c
+++ b/src/libsystemd/test-bus-error.c
diff --git a/src/libsystemd-bus/test-bus-gvariant.c b/src/libsystemd/test-bus-gvariant.c
index cb07c96273..cb07c96273 100644
--- a/src/libsystemd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/test-bus-gvariant.c
diff --git a/src/libsystemd-bus/test-bus-introspect.c b/src/libsystemd/test-bus-introspect.c
index 67b6461f30..67b6461f30 100644
--- a/src/libsystemd-bus/test-bus-introspect.c
+++ b/src/libsystemd/test-bus-introspect.c
diff --git a/src/libsystemd-bus/test-bus-kernel-benchmark.c b/src/libsystemd/test-bus-kernel-benchmark.c
index 04627d9a77..04627d9a77 100644
--- a/src/libsystemd-bus/test-bus-kernel-benchmark.c
+++ b/src/libsystemd/test-bus-kernel-benchmark.c
diff --git a/src/libsystemd-bus/test-bus-kernel-bloom.c b/src/libsystemd/test-bus-kernel-bloom.c
index 0ecad18f45..0ecad18f45 100644
--- a/src/libsystemd-bus/test-bus-kernel-bloom.c
+++ b/src/libsystemd/test-bus-kernel-bloom.c
diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd/test-bus-kernel.c
index 9b17a35e4a..9b17a35e4a 100644
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd/test-bus-kernel.c
diff --git a/src/libsystemd-bus/test-bus-marshal.c b/src/libsystemd/test-bus-marshal.c
index 4fad049ab6..4fad049ab6 100644
--- a/src/libsystemd-bus/test-bus-marshal.c
+++ b/src/libsystemd/test-bus-marshal.c
diff --git a/src/libsystemd-bus/test-bus-match.c b/src/libsystemd/test-bus-match.c
index 7227e2585d..7227e2585d 100644
--- a/src/libsystemd-bus/test-bus-match.c
+++ b/src/libsystemd/test-bus-match.c
diff --git a/src/libsystemd-bus/test-bus-memfd.c b/src/libsystemd/test-bus-memfd.c
index b9d6a250c3..b9d6a250c3 100644
--- a/src/libsystemd-bus/test-bus-memfd.c
+++ b/src/libsystemd/test-bus-memfd.c
diff --git a/src/libsystemd-bus/test-bus-objects.c b/src/libsystemd/test-bus-objects.c
index e2423c7f67..e2423c7f67 100644
--- a/src/libsystemd-bus/test-bus-objects.c
+++ b/src/libsystemd/test-bus-objects.c
diff --git a/src/libsystemd-bus/test-bus-server.c b/src/libsystemd/test-bus-server.c
index 0e65ee782a..0e65ee782a 100644
--- a/src/libsystemd-bus/test-bus-server.c
+++ b/src/libsystemd/test-bus-server.c
diff --git a/src/libsystemd-bus/test-bus-signature.c b/src/libsystemd/test-bus-signature.c
index 3fc565c620..3fc565c620 100644
--- a/src/libsystemd-bus/test-bus-signature.c
+++ b/src/libsystemd/test-bus-signature.c
diff --git a/src/libsystemd-bus/test-bus-zero-copy.c b/src/libsystemd/test-bus-zero-copy.c
index 5ad8ed54b0..5ad8ed54b0 100644
--- a/src/libsystemd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/test-bus-zero-copy.c
diff --git a/src/libsystemd-bus/test-dns.c b/src/libsystemd/test-dns.c
index b4f064f2fd..b4f064f2fd 100644
--- a/src/libsystemd-bus/test-dns.c
+++ b/src/libsystemd/test-dns.c
diff --git a/src/libsystemd-bus/test-event.c b/src/libsystemd/test-event.c
index 28ef6a3692..28ef6a3692 100644
--- a/src/libsystemd-bus/test-event.c
+++ b/src/libsystemd/test-event.c