diff --git a/mocha-dotnet/src/lib/Mocha.Core.UI.Server/Commands/TenantsListCommand.cs b/mocha-dotnet/src/lib/Mocha.Core.UI.Server/Commands/TenantsListCommand.cs
index bd7304d..5a2d3d6 100644
--- a/mocha-dotnet/src/lib/Mocha.Core.UI.Server/Commands/TenantsListCommand.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core.UI.Server/Commands/TenantsListCommand.cs
@@ -36,7 +36,9 @@ public class TenantsListCommand : OmsServerCommand
 		IEnumerable<string> tenants = oms.GetTenants();
 		foreach (string tenant in tenants)
 		{
-			ary.Add(JsonValue.Create(tenant));
+			JsonObject ob = new JsonObject();
+			ob.Add("name", JsonValue.Create(tenant));
+			ary.Add(ob);
 		}
 
 		if (e.Context.Request.PathParts.Length == 2)
diff --git a/mocha-dotnet/tests/Mocha.Oms.Server.Tests/RemoteTests.cs b/mocha-dotnet/tests/Mocha.Oms.Server.Tests/RemoteTests.cs
index b21996d..197a751 100644
--- a/mocha-dotnet/tests/Mocha.Oms.Server.Tests/RemoteTests.cs
+++ b/mocha-dotnet/tests/Mocha.Oms.Server.Tests/RemoteTests.cs
@@ -59,8 +59,8 @@ public class RemoteTests
 		
 		JsonObject json = JsonNode.Parse(content) as JsonObject;
 		Assert.That(json["result"].ToString(), Is.EqualTo("success"));
-		Assert.That(json["tenants"].AsArray().Count, Is.EqualTo(1));
-		Assert.That(json["tenants"].AsArray()[0].ToString(), Is.EqualTo("super"));
+		// Assert.That(json["tenants"].AsArray().Count, Is.EqualTo(1));
+		Assert.That(json["tenants"].AsArray()[0]["name"].ToString(), Is.EqualTo("super"));
 	}
 
 	/// <summary>