diff --git a/genesis/src/main.rs b/genesis/src/main.rs
index 9bd6e7db55..c46235fd90 100644
--- a/genesis/src/main.rs
+++ b/genesis/src/main.rs
@@ -7,14 +7,14 @@ use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil};
 use std::error;
 
 /**
- * Bootstrap leader gets two tokens:
- * - one token to create an instance of the vote_program with
- * - one token for the transaction fee
- * - one second token to keep the node identity public key valid
+ * Bootstrap leader gets two lamports:
+ * - one lamport to create an instance of the vote_program with
+ * - one lamport for the transaction fee
+ * - one second lamport to keep the node identity public key valid
  */
 //pub const BOOTSTRAP_LEADER_LAMPORTS: u64 = 3;
 // TODO: Until https://github.com/solana-labs/solana/issues/2355 is resolved the bootstrap leader
-// needs N tokens as its vote account gets re-created on every node restart, costing it tokens
+// needs N lamports as its vote account gets re-created on every node restart, costing it lamports
 pub const BOOTSTRAP_LEADER_LAMPORTS: u64 = 1_000_000;
 
 fn main() -> Result<(), Box<dyn error::Error>> {
@@ -39,13 +39,13 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                 .help("Use directory as persistent ledger location"),
         )
         .arg(
-            Arg::with_name("num_tokens")
+            Arg::with_name("lamports")
                 .short("t")
-                .long("num_tokens")
-                .value_name("TOKENS")
+                .long("lamports")
+                .value_name("LAMPORTS")
                 .takes_value(true)
                 .required(true)
-                .help("Number of tokens to create in the mint"),
+                .help("Number of lamports to create in the mint"),
         )
         .arg(
             Arg::with_name("mint_keypair_file")
@@ -61,14 +61,14 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     let bootstrap_leader_keypair_file = matches.value_of("bootstrap_leader_keypair_file").unwrap();
     let ledger_path = matches.value_of("ledger_path").unwrap();
     let mint_keypair_file = matches.value_of("mint_keypair_file").unwrap();
-    let num_tokens = value_t_or_exit!(matches, "num_tokens", u64);
+    let lamports = value_t_or_exit!(matches, "lamports", u64);
 
     let bootstrap_leader_keypair = read_keypair(bootstrap_leader_keypair_file)?;
     let mint_keypair = read_keypair(mint_keypair_file)?;
 
     let bootstrap_leader_vote_account_keypair = Keypair::new();
     let (mut genesis_block, _mint_keypair) = GenesisBlock::new_with_leader(
-        num_tokens,
+        lamports,
         bootstrap_leader_keypair.pubkey(),
         BOOTSTRAP_LEADER_LAMPORTS,
     );
diff --git a/multinode-demo/fullnode.sh b/multinode-demo/fullnode.sh
index e7f0d204c6..ac55a66a41 100755
--- a/multinode-demo/fullnode.sh
+++ b/multinode-demo/fullnode.sh
@@ -191,15 +191,15 @@ if [[ ! -d "$ledger_config_dir" ]]; then
 
   $solana_wallet --keypair "$fullnode_id_path" address
 
-  # A fullnode requires 3 tokens to function:
+  # A fullnode requires 3 lamports to function:
   # - one token to create an instance of the vote_program with
   # - one token for the transaction fee
   # - one token to keep the node identity public key valid.
   retries=5
   while true; do
     # TODO: Until https://github.com/solana-labs/solana/issues/2355 is resolved
-    # a fullnode needs N tokens as its vote account gets re-created on every
-    # node restart, costing it tokens
+    # a fullnode needs N lamports as its vote account gets re-created on every
+    # node restart, costing it lamports
     if $solana_wallet --keypair "$fullnode_id_path" --host "${leader_address%:*}" airdrop 1000000; then
       break
     fi
diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh
index bfee95ed95..60bed461b2 100755
--- a/multinode-demo/setup.sh
+++ b/multinode-demo/setup.sh
@@ -14,11 +14,11 @@ usage () {
     echo "Error: $*"
   fi
   cat <<EOF
-usage: $0 [-n num_tokens] [-l] [-p] [-t node_type]
+usage: $0 [-n lamports] [-l] [-p] [-t node_type]
 
 Creates a fullnode configuration
 
- -n num_tokens  - Number of tokens to create
+ -n lamports    - Number of lamports to create
  -t node_type   - Create configuration files only for this kind of node.  Valid
                   options are bootstrap-leader or fullnode.  Creates configuration files
                   for both by default
@@ -27,7 +27,7 @@ EOF
   exit $exitcode
 }
 
-num_tokens=1000000000
+lamports=1000000000
 bootstrap_leader=true
 fullnode=true
 while getopts "h?n:lpt:" opt; do
@@ -37,7 +37,7 @@ while getopts "h?n:lpt:" opt; do
     exit 0
     ;;
   n)
-    num_tokens="$OPTARG"
+    lamports="$OPTARG"
     ;;
   t)
     node_type="$OPTARG"
@@ -80,7 +80,7 @@ if $bootstrap_leader; then
       --bootstrap-leader-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json \
       --ledger "$SOLANA_RSYNC_CONFIG_DIR"/ledger \
       --mint "$SOLANA_CONFIG_DIR"/mint-id.json \
-      --num_tokens "$num_tokens"
+      --lamports "$lamports"
     cp -a "$SOLANA_RSYNC_CONFIG_DIR"/ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger
   )
 fi
diff --git a/run.sh b/run.sh
index f58cda99de..1eb48493be 100755
--- a/run.sh
+++ b/run.sh
@@ -43,7 +43,7 @@ solana-keygen -o "$dataDir"/config/leader-keypair.json
 solana-keygen -o "$dataDir"/config/drone-keypair.json
 
 solana-genesis \
-  --num_tokens 1000000000 \
+  --lamports 1000000000 \
   --mint "$dataDir"/config/drone-keypair.json \
   --bootstrap-leader-keypair "$dataDir"/config/leader-keypair.json \
   --ledger "$dataDir"/ledger