diff --git a/data/meson.build b/data/meson.build
index f2b628c2..c171c773 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,21 +2,21 @@ install_data('sysprof-mime.xml',
   install_dir: join_paths(datadir, 'mime/packages')
 )
 
-install_data('org.gnome.sysprof2.gschema.xml',
+install_data('org.gnome.sysprof3.gschema.xml',
   install_dir: join_paths(datadir, 'glib-2.0/schemas')
 )
 
 i18n.merge_file(
-          input: 'org.gnome.Sysprof2.appdata.xml.in',
-         output: 'org.gnome.Sysprof2.appdata.xml',
+          input: 'org.gnome.Sysprof3.appdata.xml.in',
+         output: 'org.gnome.Sysprof3.appdata.xml',
          po_dir: podir,
         install: true,
     install_dir: join_paths(datadir, 'metainfo')
 )
 
 i18n.merge_file(
-          input: 'org.gnome.Sysprof2.desktop.in',
-         output: 'org.gnome.Sysprof2.desktop',
+          input: 'org.gnome.Sysprof3.desktop.in',
+         output: 'org.gnome.Sysprof3.desktop',
            type: 'desktop',
          po_dir: podir,
         install: true,
diff --git a/data/org.gnome.Sysprof2.appdata.xml.in b/data/org.gnome.Sysprof2.appdata.xml.in
index f4fa6018..d03aec50 100644
--- a/data/org.gnome.Sysprof2.appdata.xml.in
+++ b/data/org.gnome.Sysprof2.appdata.xml.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>org.gnome.Sysprof2.desktop</id>
+  <id>org.gnome.Sysprof3.desktop</id>
   <translation type="gettext">sysprof</translation>
   <name>Sysprof</name>
-  <summary>Profiler for an application or entire system</summary>
+  <summary>Profile an application or entire system</summary>
   <project_license>GPL-3.0+</project_license>
   <project_group>GNOME</project_group>
   <developer_name>The GNOME Foundation</developer_name>
@@ -13,7 +13,7 @@
   </description>
 
   <url type="homepage">https://wiki.gnome.org/Apps/Sysprof</url>
-  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=sysprof</url>
+  <url type="bugtracker">https://gitlab.gnome.org/GNOME/sysprof/issues</url>
   <url type="donation">https://www.gnome.org/friends</url>
 
   <screenshots>
@@ -32,15 +32,13 @@
   <provides>
     <binary>sysprof</binary>
     <binary>sysprof-cli</binary>
-    <dbus type="system">org.gnome.Sysprof2</dbus>
+    <dbus type="system">org.gnome.Sysprof3</dbus>
   </provides>
 
   <releases>
     <release version="3.31.91" date="2019-02-18"/>
-    <release version="3.31.90" date="2019-02-07"/>
-    <release version="3.31.1" date="2018-10-08"/>
   </releases>
 
   <metadata_license>CC0-1.0</metadata_license>
-  <update_contact>christian_AT_hergert.me</update_contact>
+  <update_contact>chergert_AT_redhat.com</update_contact>
 </component>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c4c20a7d..39acf5f2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,20 +1,28 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/org.gnome.Sysprof2.appdata.xml.in
-data/org.gnome.Sysprof2.desktop.in
-data/org.gnome.sysprof2.gschema.xml
-data/org.gnome.sysprof2.policy.in
-lib/callgraph/sp-callgraph-profile.c
-lib/resources/ui/sp-callgraph-view.ui
-lib/resources/ui/sp-empty-state-view.ui
-lib/resources/ui/sp-failed-state-view.ui
-lib/resources/ui/sp-profiler-menu-button.ui
-lib/resources/ui/sp-recording-state-view.ui
-lib/sources/sp-perf-source.c
-lib/visualizers/sp-visualizer-list.c
-lib/widgets/sp-profiler-menu-button.c
-src/resources/gtk/help-overlay.ui
-src/resources/ui/sp-window.ui
-src/sp-application.c
-src/sp-window.c
-tools/sysprof-cli.c
+data/org.gnome.Sysprof3.appdata.xml.in
+data/org.gnome.Sysprof3.desktop.in
+data/org.gnome.sysprof3.gschema.xml
+data/org.gnome.sysprof3.policy.in
+src/sysprof/ui/sysprof-window.ui
+src/sysprof/gtk/help-overlay.ui
+src/libsysprof-ui/ui/sysprof-profiler-menu-button.ui
+src/libsysprof-ui/ui/sysprof-callgraph-view.ui
+src/libsysprof-ui/ui/sysprof-process-model-row.ui
+src/libsysprof-ui/ui/sysprof-visualizer-view.ui
+src/libsysprof-ui/ui/sysprof-empty-state-view.ui
+src/libsysprof-ui/ui/sysprof-recording-state-view.ui
+src/libsysprof-ui/ui/sysprof-failed-state-view.ui
+src/libsysprof-ui/sysprof-callgraph-view.c
+src/libsysprof-ui/sysprof-cell-renderer-percent.c
+src/libsysprof-ui/sysprof-profiler-menu-button.c
+src/libsysprof-ui/sysprof-visualizer-list.c
+src/libsysprof-ui/sysprof-visualizer-ticks.c
+src/libsysprof-ui/sysprof-visualizer-view.c
+src/libsysprof-ui/sysprof-zoom-manager.c
+src/libsysprof/sysprof-callgraph-profile.c
+src/libsysprof/sysprof-perf-source.c
+src/sysprof/sysprof-application.c
+src/sysprof/sysprof-window.c
+src/sysprof/sysprof.c
+src/tools/sysprof-cli.c
diff --git a/src/libsysprof/sysprof-perf-counter.c b/src/libsysprof/sysprof-perf-counter.c
index ca62784f..d818486c 100644
--- a/src/libsysprof/sysprof-perf-counter.c
+++ b/src/libsysprof/sysprof-perf-counter.c
@@ -439,9 +439,9 @@ get_proxy (void)
                                   G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
                                   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION),
                                  NULL,
-                                 "org.gnome.Sysprof2",
-                                 "/org/gnome/Sysprof2",
-                                 "org.gnome.Sysprof2",
+                                 "org.gnome.Sysprof3",
+                                 "/org/gnome/Sysprof3",
+                                 "org.gnome.Sysprof3.Service",
                                  NULL, NULL);
 
   if (proxy != NULL)
@@ -475,7 +475,7 @@ authorize_proxy (GDBusProxy *proxy)
   if (subject == NULL)
     goto failure;
 
-  permission = polkit_permission_new_sync ("org.gnome.sysprof2.perf-event-open", subject, NULL, NULL);
+  permission = polkit_permission_new_sync ("org.gnome.sysprof3.profile", subject, NULL, NULL);
   if (permission == NULL)
     goto failure;
 
diff --git a/src/sysprofd/meson.build b/src/sysprofd/meson.build
index 038ea769..5cdbc6c0 100644
--- a/src/sysprofd/meson.build
+++ b/src/sysprofd/meson.build
@@ -28,15 +28,15 @@ sysprofdconf = configuration_data()
 sysprofdconf.set('sysprofdprivdir', pkglibexecdir)
 
 configure_file(
-          input: 'org.gnome.Sysprof2.service.in',
-         output: 'org.gnome.Sysprof2.service',
+          input: 'org.gnome.Sysprof3.service.in',
+         output: 'org.gnome.Sysprof3.service',
   configuration: sysprofdconf,
     install_dir: join_paths(datadir, 'dbus-1/system-services'),
 )
 
 configure_file(
-          input: 'org.gnome.Sysprof2.conf.in',
-         output: 'org.gnome.Sysprof2.conf',
+          input: 'org.gnome.Sysprof3.conf.in',
+         output: 'org.gnome.Sysprof3.conf',
   configuration: sysprofdconf,
     install_dir: join_paths(datadir, 'dbus-1/system.d'),
 )
@@ -46,8 +46,8 @@ if systemdunitdir == ''
   systemdunitdir = dependency('systemd').get_pkgconfig_variable('systemdsystemunitdir')
 endif
 configure_file(
-          input: 'sysprof2.service.in',
-         output: 'sysprof2.service',
+          input: 'sysprof3.service.in',
+         output: 'sysprof3.service',
   configuration: sysprofdconf,
     install_dir: systemdunitdir,
 )
diff --git a/src/sysprofd/org.gnome.Sysprof2.conf.in b/src/sysprofd/org.gnome.Sysprof3.conf.in
similarity index 61%
rename from src/sysprofd/org.gnome.Sysprof2.conf.in
rename to src/sysprofd/org.gnome.Sysprof3.conf.in
index c46c7a6b..0ec94b1b 100644
--- a/src/sysprofd/org.gnome.Sysprof2.conf.in
+++ b/src/sysprofd/org.gnome.Sysprof3.conf.in
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!DOCTYPE busconfig PUBLIC
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
   <!-- Only root can own the service -->
   <policy user="root">
-    <allow own="org.gnome.Sysprof2"/>
-    <allow send_destination="org.gnome.Sysprof2"/>
-    <allow receive_sender="org.gnome.Sysprof2"/>
+    <allow own="org.gnome.Sysprof3"/>
+    <allow send_destination="org.gnome.Sysprof3"/>
+    <allow receive_sender="org.gnome.Sysprof3"/>
   </policy>
 
-  <!-- Anyone can send messages to the owner of org.gnome.Sysprof2 -->
+  <!-- Anyone can send messages to the owner of org.gnome.Sysprof3 -->
   <policy context="default">
-    <allow send_destination="org.gnome.Sysprof2"/>
-    <allow receive_sender="org.gnome.Sysprof2"/>
+    <allow send_destination="org.gnome.Sysprof3"/>
+    <allow receive_sender="org.gnome.Sysprof3"/>
   </policy>
 </busconfig>
diff --git a/src/sysprofd/org.gnome.Sysprof2.service.in b/src/sysprofd/org.gnome.Sysprof3.service.in
similarity index 50%
rename from src/sysprofd/org.gnome.Sysprof2.service.in
rename to src/sysprofd/org.gnome.Sysprof3.service.in
index 3455b650..b749d9b1 100644
--- a/src/sysprofd/org.gnome.Sysprof2.service.in
+++ b/src/sysprofd/org.gnome.Sysprof3.service.in
@@ -1,5 +1,5 @@
 [D-BUS Service]
-Name=org.gnome.Sysprof2
+Name=org.gnome.Sysprof3
 Exec=@sysprofdprivdir@/sysprofd
 User=root
-SystemdService=sysprof2.service
+SystemdService=sysprof3.service
diff --git a/src/sysprofd/sysprof2.service.in b/src/sysprofd/sysprof3.service.in
similarity index 77%
rename from src/sysprofd/sysprof2.service.in
rename to src/sysprofd/sysprof3.service.in
index 9ee46328..684b904a 100644
--- a/src/sysprofd/sysprof2.service.in
+++ b/src/sysprofd/sysprof3.service.in
@@ -3,6 +3,6 @@ Description=Sysprof Daemon
 
 [Service]
 Type=dbus
-BusName=org.gnome.Sysprof2
+BusName=org.gnome.Sysprof3
 ExecStart=@sysprofdprivdir@/sysprofd