diff --git a/apps/token-manager/app/src/components/InfoBoxes.js b/apps/token-manager/app/src/components/InfoBoxes.js
index cc9669dd99..083c893b69 100644
--- a/apps/token-manager/app/src/components/InfoBoxes.js
+++ b/apps/token-manager/app/src/components/InfoBoxes.js
@@ -106,7 +106,7 @@ function InfoBoxes({
       </Box>
       <Box heading="Ownership Distribution">
         <Distribution
-          heading="Token holder stakes"
+          heading="Tokenholder stakes"
           items={stakes}
           renderLegendItem={({ item: account }) => {
             const isCurrentUser = addressesEqual(account, connectedAccount)
diff --git a/apps/token-manager/app/src/screens/EmptyState.js b/apps/token-manager/app/src/screens/EmptyState.js
index 1ecc31b224..7fc5713093 100644
--- a/apps/token-manager/app/src/screens/EmptyState.js
+++ b/apps/token-manager/app/src/screens/EmptyState.js
@@ -13,14 +13,14 @@ const EmptyState = React.memo(function NoVotes({ onAssignHolder }) {
       `}
     >
       <EmptyStateCard
-        text="There are no token holders yet!"
+        text="There are no tokenholders yet!"
         action={
           <Button wide mode="strong" onClick={onAssignHolder}>
             Add tokens to an address
           </Button>
         }
         illustration={
-          <img css="margin: auto;" src={emptyIcon} alt="No token holders" />
+          <img css="margin: auto;" src={emptyIcon} alt="No tokenholders" />
         }
       />
     </div>
diff --git a/apps/token-manager/app/src/script.js b/apps/token-manager/app/src/script.js
index 816030b909..826a15ba60 100644
--- a/apps/token-manager/app/src/script.js
+++ b/apps/token-manager/app/src/script.js
@@ -134,7 +134,7 @@ function initState({ token, tokenAddress }) {
       ...tokenSettings,
     }
 
-    // It's safe to not refresh the balances of all token holders
+    // It's safe to not refresh the balances of all tokenholders
     // because we process any event that could change balances, even with block caching
 
     return inititalState
diff --git a/apps/token-manager/test/tokenmanager.js b/apps/token-manager/test/tokenmanager.js
index b2107cc088..a6e9c96577 100644
--- a/apps/token-manager/test/tokenmanager.js
+++ b/apps/token-manager/test/tokenmanager.js
@@ -246,7 +246,7 @@ contract('Token Manager', ([root, holder, holder2, anyone]) => {
                 await assertRevert(tokenManager.assign(holder, 51), errors.TM_ASSIGN_TRANSFER_FROM_REVERTED)
             })
 
-            it('allows token holders to forwards actions', async () => {
+            it('allows tokenholders to forwards actions', async () => {
                 const executionTarget = await ExecutionTarget.new()
                 await tokenManager.mint(holder, 100)
 
@@ -257,7 +257,7 @@ contract('Token Manager', ([root, holder, holder2, anyone]) => {
                 assert.equal(await executionTarget.counter(), 1, 'should have received execution call')
             })
 
-            it('disallows non-token holders from forwarding actions', async () => {
+            it('disallows non-tokenholders from forwarding actions', async () => {
                 const executionTarget = await ExecutionTarget.new()
                 const action = { to: executionTarget.address, calldata: executionTarget.contract.execute.getData() }
                 const script = encodeCallScript([action])