   AND process.name NOT LIKE '%chrome%'
   AND app_name IS NOT NULL;
 
-DROP TABLE IF EXISTS webview_browser_power;
+DROP TABLE IF EXISTS webview_browser_slices_power;
 
 -- Assign power usage to WebView browser slices.
-CREATE VIRTUAL TABLE webview_browser_power
+CREATE VIRTUAL TABLE webview_browser_slices_power
 USING SPAN_JOIN(power_per_thread PARTITIONED utid,
                 webview_browser_slices PARTITIONED utid);
 
-DROP VIEW IF EXISTS webview_browser_power_summary;
+DROP VIEW IF EXISTS webview_browser_slices_power_summary;
 
 -- Calculate the power usage of all WebView browser slices for each app
 -- in milliampere-seconds.
-CREATE VIEW webview_browser_power_summary AS
+CREATE VIEW webview_browser_slices_power_summary AS
 SELECT
   app_name,
   SUM(dur * COALESCE(power_ma, 0) / 1e9) AS power_mas
-  FROM webview_browser_power
+  FROM webview_browser_slices_power
   GROUP BY app_name;
-
-DROP VIEW IF EXISTS webview_browser_power_per_core_type;
-
--- Calculate the power usage of all WebView browser slices for each app
--- in milliampere-seconds grouped by core type.
-CREATE VIEW webview_browser_power_per_core_type AS
-SELECT
-  app_name,
-  core_type_per_cpu.core_type AS core_type,
-  SUM(dur * COALESCE(power_ma, 0) / 1e9) AS power_mas
-FROM webview_browser_power
-INNER JOIN core_type_per_cpu
-  ON webview_browser_power.cpu = core_type_per_cpu.cpu
-GROUP BY app_name, core_type_per_cpu.core_type;
 
 DROP VIEW IF EXISTS webview_renderer_threads;
 

  ON power_per_thread.utid = host_app_threads.utid
  GROUP BY app_name;

DROP VIEW IF EXISTS total_device_power;

-- Calculate the power usage of the device in milliampere-seconds.

CREATE VIEW host_app_threads AS
SELECT
    thread.utid AS utid,
    thread.name AS name,
    extract_arg(process.arg_set_id, 'chrome.host_app_package_name') as app_name
  FROM thread
  JOIN process ON thread.upid = process.upid
