diff --git a/api/coreservice.go b/api/coreservice.go
index f18b261f23..80710080d6 100644
--- a/api/coreservice.go
+++ b/api/coreservice.go
@@ -127,7 +127,7 @@ type (
 		ActionByActionHash(h hash.Hash256) (*action.SealedEnvelope, *block.Block, uint32, error)
 		// PendingActionByActionHash returns action by action hash
 		PendingActionByActionHash(h hash.Hash256) (*action.SealedEnvelope, error)
-		// ActPoolActions returns the all Transaction Identifiers in the actpool
+		// ActionsInActPool returns the all Transaction Identifiers in the actpool
 		ActionsInActPool(actHashes []string) ([]*action.SealedEnvelope, error)
 		// BlockByHeightRange returns blocks within the height range
 		BlockByHeightRange(uint64, uint64) ([]*apitypes.BlockWithReceipts, error)
diff --git a/ioctl/cmd/bc/bcbucketlist.go b/ioctl/cmd/bc/bcbucketlist.go
index 9eee2531db..f5788d4680 100644
--- a/ioctl/cmd/bc/bcbucketlist.go
+++ b/ioctl/cmd/bc/bcbucketlist.go
@@ -110,7 +110,7 @@ func getBucketList(method, addr string, args ...string) (err error) {
 	return output.NewError(output.InputError, "unknown <method>", nil)
 }
 
-// getBucketList get bucket list from chain by voter address
+// getBucketListByVoter get bucket list from chain by voter address
 func getBucketListByVoter(addr string, offset, limit uint32) error {
 	address, err := util.GetAddress(addr)
 	if err != nil {
diff --git a/server/itx/nodestats/systemstats.go b/server/itx/nodestats/systemstats.go
index 30d66cc5a9..c9f18615d2 100644
--- a/server/itx/nodestats/systemstats.go
+++ b/server/itx/nodestats/systemstats.go
@@ -17,7 +17,7 @@ type DiskStatus struct {
 	Free uint64 `json:"Free"`
 }
 
-// diskusage of path/disk
+// diskUsage of path/disk
 func diskUsage(path string) (disk DiskStatus) {
 	fs := syscall.Statfs_t{}
 	err := syscall.Statfs(path, &fs)
diff --git a/state/factory/factory.go b/state/factory/factory.go
index 228f5ca268..37cd5a7b62 100644
--- a/state/factory/factory.go
+++ b/state/factory/factory.go
@@ -499,7 +499,7 @@ func (sf *factory) State(s interface{}, opts ...protocol.StateOption) (uint64, e
 	return sf.currentChainHeight, state.Deserialize(s, value)
 }
 
-// State returns a set states in the state factory
+// States returns a set states in the state factory
 func (sf *factory) States(opts ...protocol.StateOption) (uint64, state.Iterator, error) {
 	sf.mutex.RLock()
 	defer sf.mutex.RUnlock()
diff --git a/state/factory/statedb.go b/state/factory/statedb.go
index 2e2be991aa..638debf7ab 100644
--- a/state/factory/statedb.go
+++ b/state/factory/statedb.go
@@ -339,7 +339,7 @@ func (sdb *stateDB) State(s interface{}, opts ...protocol.StateOption) (uint64,
 	return sdb.currentChainHeight, sdb.state(sdb.currentChainHeight, cfg.Namespace, cfg.Key, s)
 }
 
-// State returns a set of states in the state factory
+// States returns a set of states in the state factory
 func (sdb *stateDB) States(opts ...protocol.StateOption) (uint64, state.Iterator, error) {
 	cfg, err := processOptions(opts...)
 	if err != nil {
diff --git a/state/factory/workingset.go b/state/factory/workingset.go
index cb28cf880a..890ae6d0f4 100644
--- a/state/factory/workingset.go
+++ b/state/factory/workingset.go
@@ -422,7 +422,7 @@ func (ws *workingSet) Reset() {
 	ws.dock.Reset()
 }
 
-// createGenesisStates initialize the genesis states
+// CreateGenesisStates initialize the genesis states
 func (ws *workingSet) CreateGenesisStates(ctx context.Context) error {
 	if reg, ok := protocol.GetRegistry(ctx); ok {
 		for _, p := range reg.All() {