diff --git a/source/ProtocolGenerator.Tests/TypeTests.cs b/source/ProtocolGenerator.Tests/TypeTests.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1b0f6d76e2580c2da2cc4f18d6049dfd255ab42b
--- /dev/null
+++ b/source/ProtocolGenerator.Tests/TypeTests.cs
@@ -0,0 +1,39 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MasterDevs.ChromeDevTools.ProtocolGenerator.Tests
+{
+    [TestClass]
+    public class TypeTests
+    {
+
+        [TestMethod]
+        [DeploymentItem(DeploymentItems.Inspector10)]
+        public void TypeNameTest()
+        {
+            Protocol p = ProtocolProcessor.LoadProtocol(DeploymentItems.Inspector10, "Chrome-1.0");
+
+            var evaluateCommand = p.GetDomain("Page").GetCommand("searchInResource");
+            var result = evaluateCommand.Returns.Single();
+
+            Assert.AreEqual("SearchMatch[]", result.TypeName.ToString());
+        }
+
+        [TestMethod]
+        [DeploymentItem(DeploymentItems.Inspector10)]
+        public void ToStringTest()
+        {
+            Protocol p = ProtocolProcessor.LoadProtocol(DeploymentItems.Inspector10, "Chrome-1.0");
+
+            var evaluateCommand = p.GetDomain("Page").GetCommand("searchInResource");
+            var result = evaluateCommand.Returns.Single();
+            var items = result.Items;
+
+            Assert.AreEqual("SearchMatch", items.ToString());
+        }
+    }
+}
diff --git a/source/ProtocolGenerator/Type.cs b/source/ProtocolGenerator/Type.cs
index 436cb22b1f0b6ee352014fd0b00f5a673cf2b85f..f383acfb1dfbf47d0c8dfba2a17d5f00498d1c9a 100644
--- a/source/ProtocolGenerator/Type.cs
+++ b/source/ProtocolGenerator/Type.cs
@@ -75,7 +75,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
                 }
                 else if (this.Items != null)
                 {
-                    return this.Items.Name + "[]";
+                    return this.Items.TypeName + "[]";
                 }
                 else if (this.Kind != null && this.Kind != "object")
                 {
@@ -158,5 +158,10 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
         {
             return string.Equals(this.Kind, "object", StringComparison.OrdinalIgnoreCase);
         }
+
+        public override string ToString()
+        {
+            return this.TypeName;
+        }
     }
 }