diff --git a/crates/apps_lib/src/cli.rs b/crates/apps_lib/src/cli.rs
index cc593628d60..35d18cdad33 100644
--- a/crates/apps_lib/src/cli.rs
+++ b/crates/apps_lib/src/cli.rs
@@ -2108,9 +2108,10 @@ pub mod cmds {
         fn def() -> App {
             App::new(Self::CMD)
                 .about(wrap!(
-                    "Query the total supply in the network of the given \
-                     token. For the native token, this will query the raw \
-                     total supply and not the effective total supply."
+                    "Query the effective total circulating supply of the \
+                     native token NAM. This excludes illquid NAM tokens held \
+                     in places such as the PGF account. This is the token \
+                     amount used in inflation calculations."
                 ))
                 .add_args::<args::QueryEffNativeSupply<args::CliTypes>>()
         }
@@ -7055,7 +7056,7 @@ pub mod args {
         }
 
         fn def(app: App) -> App {
-            app
+            app.add_args::<Query<CliTypes>>()
         }
     }
 
diff --git a/crates/apps_lib/src/client/rpc.rs b/crates/apps_lib/src/client/rpc.rs
index 15126d1652c..8d307fe0e01 100644
--- a/crates/apps_lib/src/client/rpc.rs
+++ b/crates/apps_lib/src/client/rpc.rs
@@ -1188,7 +1188,10 @@ pub async fn query_total_supply<N: Namada>(
             .total_supply(context.client(), &token)
             .await,
     );
-    display_line!(context.io(), "Total supply of {token}: {supply}");
+    display_line!(
+        context.io(),
+        "Total supply of token {token}: {supply} raw units"
+    );
 }
 
 /// Query the effective total supply of the native token
@@ -1199,7 +1202,7 @@ pub async fn query_effective_native_supply<N: Namada>(context: &N) {
             .effective_native_supply(context.client())
             .await,
     );
-    display_line!(context.io(), "{native_supply} NAM");
+    display_line!(context.io(), "nam: {}", native_supply.to_string_native());
 }
 
 /// Query a validator's state information
diff --git a/crates/tests/src/e2e/setup.rs b/crates/tests/src/e2e/setup.rs
index e3fa45c7788..0e5f6db696a 100644
--- a/crates/tests/src/e2e/setup.rs
+++ b/crates/tests/src/e2e/setup.rs
@@ -1469,6 +1469,7 @@ pub mod constants {
     //  Native VP aliases
     pub const GOVERNANCE_ADDRESS: &str = "governance";
     pub const MASP: &str = "masp";
+    pub const PGF_ADDRESS: &str = "pgf";
 
     // Fungible token addresses
     pub const NAM: &str = "NAM";