diff --git a/.project b/.project
index 07cfe82..c1a527c 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>pentaho-mqtt-client</name>
+	<name>pentaho-mqtt-producer</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/README.md b/README.md
index 6efbaac..4f1a067 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,19 @@
-pentaho-mqtt-client
+pentaho-mqtt-producer
 ======================
 
-MQTT client step plug-in for Pentaho Kettle.
+MQTT producer step plug-in for Pentaho Kettle.
 
-[![Build Status](https://travis-ci.org/RuckusWirelessIL/pentaho-mqtt-client.png)](https://travis-ci.org/RuckusWirelessIL/pentaho-mqtt-client)
+[![Build Status](https://travis-ci.org/RuckusWirelessIL/pentaho-mqtt-producer.png)](https://travis-ci.org/RuckusWirelessIL/pentaho-mqtt-producer)
 
 
 ### Screenshots ###
 
-![Using MQTT Client step in Kettle](https://raw.github.com/RuckusWirelessIL/pentaho-mqtt-client/master/doc/example.png)
+![Using MQTT Client step in Kettle](https://raw.github.com/RuckusWirelessIL/pentaho-mqtt-producer/master/doc/example.png)
 
 
 ### Installation ###
 
-1. Download ```pentaho-mqtt-client``` Zip archive from [latest release page](https://github.com/RuckusWirelessIL/pentaho-mqtt-client/releases/latest).
+1. Download ```pentaho-mqtt-producer``` Zip archive from [latest release page](https://github.com/RuckusWirelessIL/pentaho-mqtt-producer/releases/latest).
 2. Extract downloaded archive into *plugins/steps* directory of your Pentaho Data Integration distribution.
 
 
diff --git a/assembly.xml b/assembly.xml
index 9e240a8..031ae05 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -19,6 +19,7 @@
 			<directory>target/lib</directory>
 			<outputDirectory>lib</outputDirectory>
 			<includes>
+				<include>mqtt-client-0.4.0.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
diff --git a/doc/example.png b/doc/example.png
index ce9e36e..a7e9496 100644
Binary files a/doc/example.png and b/doc/example.png differ
diff --git a/pom.xml b/pom.xml
index 47274a6..f19c4b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ruckuswireless</groupId>
-	<artifactId>pentaho-mqtt-client</artifactId>
+	<artifactId>pentaho-mqtt-producer</artifactId>
 	<version>TRUNK-SNAPSHOT</version>
-	<name>MQTT Client Plug-In for Pentaho</name>
+	<name>MQTT Producer Plug-In for Pentaho</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -58,6 +58,11 @@
 			<version>4.3</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.paho</groupId>
+			<artifactId>mqtt-client</artifactId>
+			<version>0.4.0</version>
+		</dependency>
 	</dependencies>
 
 
diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png
index 88c3732..716da67 100644
Binary files a/src/main/resources/logo.png and b/src/main/resources/logo.png differ
diff --git a/src/main/resources/plugin.xml b/src/main/resources/plugin.xml
index 6954a16..61a6acb 100644
--- a/src/main/resources/plugin.xml
+++ b/src/main/resources/plugin.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin
-	id="MQTTClient"
+	id="MQTTProducer"
 	iconfile="logo.png"
-	description="MQTT Client"
+	description="MQTT Producer"
 	tooltip="This plug-in allows sending messages via MQTT client"
 	category="Output"
-	classname="com.ruckuswireless.pentaho.mqtt.client.MQTTClientMeta">
+	classname="com.ruckuswireless.pentaho.mqtt.producer.MQTTProducerMeta">
 	
 	<libraries>
-		<library name="pentaho-kafka-producer.jar"/>
-		<library name="lib/activation-1.1.jar"/>
+		<library name="pentaho-mqtt-producer.jar"/>
+		<library name="lib/mqtt-client-0.4.0.jar"/>
 	</libraries>
     
 	<localized_category>
 		<category locale="en_US">Output</category>
 	</localized_category>
 	<localized_description>
-		<description locale="en_US">MQTT Client</description>
+		<description locale="en_US">MQTT Producer</description>
 	</localized_description>
 	<localized_tooltip>
 		<tooltip locale="en_US">This plug-in allows sending messages via MQTT client</tooltip>