diff --git a/packages/subgraph/schema.graphql b/packages/subgraph/schema.graphql
index da18f091..e4dbf2c1 100644
--- a/packages/subgraph/schema.graphql
+++ b/packages/subgraph/schema.graphql
@@ -1,11 +1,11 @@
 interface IPlugin {
-  id: ID! # Plugin Address
+  id: ID! # Plugin address
   daoAddress: Bytes!
   pluginAddress: Bytes!
 }
 
 type AdminPlugin implements IPlugin @entity {
-  id: ID! # Plugin Address
+  id: ID! # Plugin address
   daoAddress: Bytes!
   pluginAddress: Bytes!
   proposals: [AdminProposal!]! @derivedFrom(field: "plugin")
@@ -13,7 +13,7 @@ type AdminPlugin implements IPlugin @entity {
 }
 
 type Administrator @entity(immutable: true) {
-  id: ID! # Administrator Address
+  id: ID! # Administrator address
   address: String # address as string to facilitate filtering by address on the UI
   proposals: [AdminProposal!]! @derivedFrom(field: "administrator")
   plugins: [AdministratorAdminPlugin!]! @derivedFrom(field: "administrator")
@@ -21,13 +21,13 @@ type Administrator @entity(immutable: true) {
 
 type AdministratorAdminPlugin @entity {
   "for Many-to-Many"
-  id: ID! # Plugin Address + Administrator Address
+  id: ID! # Plugin address + Administrator address
   administrator: Administrator!
   plugin: AdminPlugin!
 }
 
 interface IProposal {
-  id: ID! # Plugin Address + proposalId
+  id: ID! # Plugin address + Plugin proposal ID
   daoAddress: Bytes!
   creator: Bytes!
   metadata: String
@@ -41,7 +41,7 @@ interface IProposal {
 }
 
 type AdminProposal implements IProposal @entity {
-  id: ID! # Plugin Address + proposalId
+  id: ID! # Plugin address + Plugin proposal ID
   daoAddress: Bytes!
   creator: Bytes! # Administrator address
   metadata: String
@@ -58,7 +58,7 @@ type AdminProposal implements IProposal @entity {
 }
 
 interface IAction {
-  id: ID! # Plugin Address + DAO Address + Plugin Proposal ID + action idx
+  id: ID! # Plugin address + DAO address + Plugin proposal ID + Action index
   to: Bytes!
   value: BigInt!
   data: Bytes!
@@ -66,7 +66,7 @@ interface IAction {
 }
 
 type Action implements IAction @entity(immutable: true) {
-  id: ID! # Plugin Address + DAO Address + Plugin Proposal ID + action idx
+  id: ID! # Plugin address + DAO address + Plugin proposal ID + Action index
   to: Bytes!
   value: BigInt!
   data: Bytes!