diff --git a/core/src/main/scala/kafka/producer/ConsoleProducer.scala b/core/src/main/scala/kafka/producer/ConsoleProducer.scala
index 59222a2..c6f4261 100644
--- a/core/src/main/scala/kafka/producer/ConsoleProducer.scala
+++ b/core/src/main/scala/kafka/producer/ConsoleProducer.scala
@@ -47,28 +47,28 @@ object ConsoleProducer {
     val sendTimeoutOpt = parser.accepts("timeout", "If set and the producer is running in asynchronous mode, this gives the maximum amount of time" + 
                                                    " a message will queue awaiting suffient batch size. The value is given in ms.")
                                .withRequiredArg
-                               .describedAs("timeout_ms")
+                               .describedAs("ms")
                                .ofType(classOf[java.lang.Long])
                                .defaultsTo(1000)
     val queueSizeOpt = parser.accepts("queue-size", "If set and the producer is running in asynchronous mode, this gives the maximum amount of " + 
                                                    " messages will queue awaiting suffient batch size.")
                                .withRequiredArg
-                               .describedAs("queue_size")
+                               .describedAs("size")
                                .ofType(classOf[java.lang.Long])
                                .defaultsTo(10000)
-    val queueEnqueueTimeoutMsOpt = parser.accepts("queue-enqueuetimeout-ms", "Timeout for event enqueue")
+    val queueEnqueueTimeoutMsOpt = parser.accepts("async-timeout-ms", "Timeout after which we will drop data that hasn't been sent. Defaults to never dropping data.")
                                .withRequiredArg
-                               .describedAs("queue enqueuetimeout ms")
+                               .describedAs("ms")
                                .ofType(classOf[java.lang.Long])
-                               .defaultsTo(Int.MaxValue)
+                               .defaultsTo(-1L)
     val requestRequiredAcksOpt = parser.accepts("request-required-acks", "The required acks of the producer requests")
                                .withRequiredArg
-                               .describedAs("request required acks")
+                               .describedAs("num_acks")
                                .ofType(classOf[java.lang.Integer])
                                .defaultsTo(0)
     val requestTimeoutMsOpt = parser.accepts("request-timeout-ms", "The ack timeout of the producer requests. Value must be non-negative and non-zero")
                                .withRequiredArg
-                               .describedAs("request timeout ms")
+                               .describedAs("ms")
                                .ofType(classOf[java.lang.Integer])
                                .defaultsTo(1500)
     val valueEncoderOpt = parser.accepts("value-serializer", "The class name of the message encoder implementation to use for serializing values.")