diff --git a/cookbooks/kafka/templates/default/server.properties.erb b/cookbooks/kafka/templates/default/server.properties.erb
index ee8bdfe6..4902f94f 100644
--- a/cookbooks/kafka/templates/default/server.properties.erb
+++ b/cookbooks/kafka/templates/default/server.properties.erb
@@ -20,7 +20,7 @@
 ############################# Server Basics #############################
 
 # The id of the broker. This must be set to a unique integer for each broker.
-brokerid=<%= @kafka[:broker_id] %>
+broker.id=<%= @kafka[:broker_id] %>
 
 # Hostname the broker will advertise to consumers. If not set, kafka will use the value returned
 # from InetAddress.getLocalHost().  If there are multiple interfaces getLocalHost
@@ -133,8 +133,8 @@ enable.zookeeper=<%= @zookeeper_pairs.empty? ? false : true %>
 # You can also append an optional chroot string to the urls to specify the
 # root directory for all kafka znodes.
 <% unless @zookeeper_pairs.nil? || @zookeeper_pairs.empty? %>
-zk.connect=<%= @zookeeper_pairs %>
+zookeeper.connect=<%= @zookeeper_pairs %>
 <% end %>
 
 # Timeout in ms for connecting to zookeeper
-zk.connectiontimeout.ms=1000000
+zookeeper.connectiontimeout.ms=1000000