diff --git a/token_create_transaction.go b/token_create_transaction.go
index fe86057d0..858d20faa 100644
--- a/token_create_transaction.go
+++ b/token_create_transaction.go
@@ -71,35 +71,35 @@ func (transaction *TokenCreateTransaction) SetTreasuryAccountID(treasury Account
 }
 
 // The account which will act as a treasury for the token. This account will receive the specified initial supply
-func (transaction *TokenCreateTransaction) SetAdminKey(publicKey PublicKey) *TokenCreateTransaction {
+func (transaction *TokenCreateTransaction) SetAdminKey(publicKey Key) *TokenCreateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.AdminKey = publicKey.toProtoKey()
 	return transaction
 }
 
 // The key which can perform update/delete operations on the token. If empty, the token can be perceived as immutable (not being able to be updated/deleted)
-func (transaction *TokenCreateTransaction) SetKycKey(publicKey PublicKey) *TokenCreateTransaction {
+func (transaction *TokenCreateTransaction) SetKycKey(publicKey Key) *TokenCreateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.KycKey = publicKey.toProtoKey()
 	return transaction
 }
 
 // The key which can grant or revoke KYC of an account for the token's transactions. If empty, KYC is not required, and KYC grant or revoke operations are not possible.
-func (transaction *TokenCreateTransaction) SetFreezeKey(publicKey PublicKey) *TokenCreateTransaction {
+func (transaction *TokenCreateTransaction) SetFreezeKey(publicKey Key) *TokenCreateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.FreezeKey = publicKey.toProtoKey()
 	return transaction
 }
 
 // The key which can sign to freeze or unfreeze an account for token transactions. If empty, freezing is not possible
-func (transaction *TokenCreateTransaction) SetWipeKey(publicKey PublicKey) *TokenCreateTransaction {
+func (transaction *TokenCreateTransaction) SetWipeKey(publicKey Key) *TokenCreateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.WipeKey = publicKey.toProtoKey()
 	return transaction
 }
 
 // The key which can wipe the token balance of an account. If empty, wipe is not possible
-func (transaction *TokenCreateTransaction) SetSupplyKey(publicKey PublicKey) *TokenCreateTransaction {
+func (transaction *TokenCreateTransaction) SetSupplyKey(publicKey Key) *TokenCreateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.SupplyKey = publicKey.toProtoKey()
 	return transaction
diff --git a/token_update_transaction.go b/token_update_transaction.go
index af6c13c23..caefe4c9b 100644
--- a/token_update_transaction.go
+++ b/token_update_transaction.go
@@ -58,7 +58,7 @@ func (transaction *TokenUpdateTransaction) SetTreasuryAccountID(treasury Account
 
 // The new Admin key of the Token. If Token is immutable, transaction will resolve to
 // TOKEN_IS_IMMUTABlE.
-func (transaction *TokenUpdateTransaction) SetAdminKey(publicKey PublicKey) *TokenUpdateTransaction {
+func (transaction *TokenUpdateTransaction) SetAdminKey(publicKey Key) *TokenUpdateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.AdminKey = publicKey.toProtoKey()
 	return transaction
@@ -66,7 +66,7 @@ func (transaction *TokenUpdateTransaction) SetAdminKey(publicKey PublicKey) *Tok
 
 // The new KYC key of the Token. If Token does not have currently a KYC key, transaction will
 // resolve to TOKEN_HAS_NO_KYC_KEY.
-func (transaction *TokenUpdateTransaction) SetKycKey(publicKey PublicKey) *TokenUpdateTransaction {
+func (transaction *TokenUpdateTransaction) SetKycKey(publicKey Key) *TokenUpdateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.KycKey = publicKey.toProtoKey()
 	return transaction
@@ -74,7 +74,7 @@ func (transaction *TokenUpdateTransaction) SetKycKey(publicKey PublicKey) *Token
 
 // The new Freeze key of the Token. If the Token does not have currently a Freeze key, transaction
 // will resolve to TOKEN_HAS_NO_FREEZE_KEY.
-func (transaction *TokenUpdateTransaction) SetFreezeKey(publicKey PublicKey) *TokenUpdateTransaction {
+func (transaction *TokenUpdateTransaction) SetFreezeKey(publicKey Key) *TokenUpdateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.FreezeKey = publicKey.toProtoKey()
 	return transaction
@@ -82,7 +82,7 @@ func (transaction *TokenUpdateTransaction) SetFreezeKey(publicKey PublicKey) *To
 
 // The new Wipe key of the Token. If the Token does not have currently a Wipe key, transaction
 // will resolve to TOKEN_HAS_NO_WIPE_KEY.
-func (transaction *TokenUpdateTransaction) SetWipeKey(publicKey PublicKey) *TokenUpdateTransaction {
+func (transaction *TokenUpdateTransaction) SetWipeKey(publicKey Key) *TokenUpdateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.WipeKey = publicKey.toProtoKey()
 	return transaction
@@ -90,7 +90,7 @@ func (transaction *TokenUpdateTransaction) SetWipeKey(publicKey PublicKey) *Toke
 
 // The new Supply key of the Token. If the Token does not have currently a Supply key, transaction
 // will resolve to TOKEN_HAS_NO_SUPPLY_KEY.
-func (transaction *TokenUpdateTransaction) SetSupplyKey(publicKey PublicKey) *TokenUpdateTransaction {
+func (transaction *TokenUpdateTransaction) SetSupplyKey(publicKey Key) *TokenUpdateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.SupplyKey = publicKey.toProtoKey()
 	return transaction
diff --git a/topic_create_transaction.go b/topic_create_transaction.go
index 5efca4050..0eac0e2a1 100644
--- a/topic_create_transaction.go
+++ b/topic_create_transaction.go
@@ -36,7 +36,7 @@ func NewTopicCreateTransaction() *TopicCreateTransaction {
 
 // SetAdminKey sets the key required to update or delete the topic. If unspecified, anyone can increase the topic's
 // expirationTime.
-func (transaction *TopicCreateTransaction) SetAdminKey(publicKey PublicKey) *TopicCreateTransaction {
+func (transaction *TopicCreateTransaction) SetAdminKey(publicKey Key) *TopicCreateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.AdminKey = publicKey.toProtoKey()
 	return transaction
@@ -47,7 +47,7 @@ func (transaction *TopicCreateTransaction) GetAdminKey() (Key, error) {
 }
 
 // SetSubmitKey sets the key required for submitting messages to the topic. If unspecified, all submissions are allowed.
-func (transaction *TopicCreateTransaction) SetSubmitKey(publicKey PublicKey) *TopicCreateTransaction {
+func (transaction *TopicCreateTransaction) SetSubmitKey(publicKey Key) *TopicCreateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.SubmitKey = publicKey.toProtoKey()
 	return transaction
diff --git a/topic_update_transaction.go b/topic_update_transaction.go
index d8629f0dd..7574a19b9 100644
--- a/topic_update_transaction.go
+++ b/topic_update_transaction.go
@@ -41,7 +41,7 @@ func (transaction *TopicUpdateTransaction) GetTopicID() TopicID {
 // SetAdminKey sets the key required to update/delete the topic. If unset, the key will not be changed.
 //
 // Setting the AdminKey to an empty KeyList will clear the adminKey.
-func (transaction *TopicUpdateTransaction) SetAdminKey(publicKey PublicKey) *TopicUpdateTransaction {
+func (transaction *TopicUpdateTransaction) SetAdminKey(publicKey Key) *TopicUpdateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.AdminKey = publicKey.toProtoKey()
 	return transaction
@@ -54,7 +54,7 @@ func (transaction *TopicUpdateTransaction) GetAdminKey() (Key, error) {
 // SetSubmitKey will set the key allowed to submit messages to the topic.  If unset, the key will not be changed.
 //
 // Setting the submitKey to an empty KeyList will clear the submitKey.
-func (transaction *TopicUpdateTransaction) SetSubmitKey(publicKey PublicKey) *TopicUpdateTransaction {
+func (transaction *TopicUpdateTransaction) SetSubmitKey(publicKey Key) *TopicUpdateTransaction {
 	transaction.requireNotFrozen()
 	transaction.pb.SubmitKey = publicKey.toProtoKey()
 	return transaction