diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc
index 706fcc29a0..08fa297e90 100644
--- a/db/system_keyspace.cc
+++ b/db/system_keyspace.cc
@@ -1795,17 +1795,17 @@ future<> system_keyspace::set_bootstrap_state(bootstrap_state state) {
     });
 }
 
-class nodetool_status_table : public memtable_filling_virtual_table {
+class cluster_status_table : public memtable_filling_virtual_table {
 private:
     service::storage_service& _ss;
 public:
-    nodetool_status_table(service::storage_service& ss)
+    cluster_status_table(service::storage_service& ss)
             : memtable_filling_virtual_table(build_schema())
             , _ss(ss) {}
 
     static schema_ptr build_schema() {
-        auto id = generate_legacy_id(system_keyspace::NAME, "status");
-        return schema_builder(system_keyspace::NAME, "status", std::make_optional(id))
+        auto id = generate_legacy_id(system_keyspace::NAME, "cluster_status");
+        return schema_builder(system_keyspace::NAME, "cluster_status", std::make_optional(id))
             .with_column("peer", inet_addr_type, column_kind::partition_key)
             .with_column("dc", utf8_type)
             .with_column("up", boolean_type)
@@ -1855,11 +1855,11 @@ public:
     }
 };
 
-class describe_ring_table : public streaming_virtual_table {
+class token_ring_table : public streaming_virtual_table {
 private:
     service::storage_service& _ss;
 public:
-    describe_ring_table(service::storage_service& ss)
+    token_ring_table(service::storage_service& ss)
             : streaming_virtual_table(build_schema())
             , _ss(ss)
     {
@@ -1867,8 +1867,8 @@ public:
     }
 
     static schema_ptr build_schema() {
-        auto id = generate_legacy_id(system_keyspace::NAME, "describe_ring");
-        return schema_builder(system_keyspace::NAME, "describe_ring", std::make_optional(id))
+        auto id = generate_legacy_id(system_keyspace::NAME, "token_ring");
+        return schema_builder(system_keyspace::NAME, "token_ring", std::make_optional(id))
             .with_column("keyspace_name", utf8_type, column_kind::partition_key)
             .with_column("start_token", utf8_type, column_kind::clustering_key)
             .with_column("endpoint", inet_addr_type, column_kind::clustering_key)
@@ -1953,8 +1953,8 @@ void register_virtual_tables(service::storage_service& ss) {
     };
 
     // Add built-in virtual tables here.
-    add_table(std::make_unique<nodetool_status_table>(ss));
-    add_table(std::make_unique<describe_ring_table>(ss));
+    add_table(std::make_unique<cluster_status_table>(ss));
+    add_table(std::make_unique<token_ring_table>(ss));
 }
 
 std::vector<schema_ptr> system_keyspace::all_tables(const db::config& cfg) {