Event Hub resource in ARM template

I have an event hub in my arm template, looks like this:

{"apiVersion": "[variables('serviceBusApiVersion')]","name": "[variables('serviceBusNamespaceName')]","type": "Microsoft.ServiceBus/Namespaces","location": "[resourceGroup().location]","kind": "EventHub","sku": {"name": "StandardSku","tier": "Standard"
      },"resources": [
        {"apiVersion": "[variables('serviceBusApiVersion')]","name": "[variables('serviceBusEventHubName')]","type": "EventHubs","dependsOn": ["[concat('Microsoft.ServiceBus/namespaces/', variables('serviceBusNamespaceName'))]"
          ],"properties": {"path": "[variables('serviceBusEventHubName')]","partitionCount": "[parameters('eventHubPartitionCount')]"
          },

Now when I deploy, the portal tells me "Azure Event Hubs come under the same Azure Messaging umbrella like Service Bus Messaging and Azure Relay and to take advantage of the unique messaging platform each of the service architecturally offers, we are separating our services and with that Azure Event Hubs under the Microsoft.EventHub provider will have EventHub namespace type. This means that you cannot create an EventHub under the Messaging namespace type."

As you can see from my template, I am not using the Messaging or Microsoft.EventHub namespace type. Do I just need to change the type to Microsoft.EventHub, and remove the "kind" element? Do I no longer need the event hub as a child resource of the service bus? Do consumer groups work the same way?

Thanks