diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java
index 4d9b28df91be1..3579ea49d1c48 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java
@@ -119,7 +119,7 @@ private TopicName(String completeTopicName) {
             if (!completeTopicName.contains("://")) {
                 // The short topic name can be:
                 // - <topic>
-                // - <property>/<namespace>/<topic>
+                // - <tenant>/<namespace>/<topic>
                 String[] parts = StringUtils.split(completeTopicName, '/');
                 if (parts.length == 3) {
                     completeTopicName = TopicDomain.persistent.name() + "://" + completeTopicName;
@@ -263,9 +263,9 @@ public boolean isPartitioned() {
      * For partitions in a topic, return the base partitioned topic name.
      * Eg:
      * <ul>
-     *  <li><code>persistent://prop/cluster/ns/my-topic-partition-1</code> -->
-     *  <code>persistent://prop/cluster/ns/my-topic</code>
-     *  <li><code>persistent://prop/cluster/ns/my-topic</code> --> <code>persistent://prop/cluster/ns/my-topic</code>
+     *  <li><code>persistent://tenant/cluster/ns/my-topic-partition-1</code> -->
+     *  <code>persistent://tenant/cluster/ns/my-topic</code>
+     *  <li><code>persistent://tenant/cluster/ns/my-topic</code> --> <code>persistent://tenant/cluster/ns/my-topic</code>
      * </ul>
      */
     public String getPartitionedTopicName() {
@@ -437,7 +437,7 @@ public boolean includes(TopicName otherTopicName) {
     }
 
     /**
-     * Returns true if this a V2 topic name prop/ns/topic-name.
+     * Returns true if this a V2 topic name tenant/ns/topic-name.
      * @return true if V2
      */
     public boolean isV2() {