diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/pom.xml b/gimel-dataapi/gimel-connectors/gimel-aerospike/pom.xml
similarity index 97%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/pom.xml
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/pom.xml
index d0071ded..bd3e9355 100644
--- a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/pom.xml
+++ b/gimel-dataapi/gimel-connectors/gimel-aerospike/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>gimel-aerospike-3.14</artifactId>
+  <artifactId>gimel-aerospike</artifactId>
   <version>2.4.7-SNAPSHOT</version>
 
   <dependencies>
@@ -58,7 +58,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${maven.shade.plugin.version}</version>
         <configuration>
           <relocations>
             <relocation>
diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/DataSet.scala b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/DataSet.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/DataSet.scala
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/DataSet.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeClientConfiguration.scala b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeClientConfiguration.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeClientConfiguration.scala
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeClientConfiguration.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeConfigs.scala b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeConfigs.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeConfigs.scala
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/conf/AerospikeConfigs.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/reader/AerospikeReader.scala b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/reader/AerospikeReader.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/reader/AerospikeReader.scala
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/reader/AerospikeReader.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/utilities/AeroSparkConnector.scala b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/utilities/AeroSparkConnector.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/utilities/AeroSparkConnector.scala
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/utilities/AeroSparkConnector.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/utilities/AerospikeUtilities.scala b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/utilities/AerospikeUtilities.scala
similarity index 98%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/utilities/AerospikeUtilities.scala
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/utilities/AerospikeUtilities.scala
index b34d1dff..ace5118f 100644
--- a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/utilities/AerospikeUtilities.scala
+++ b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/utilities/AerospikeUtilities.scala
@@ -57,7 +57,7 @@ object AerospikeUtilities {
       val aerospikeSet = conf.aerospikeSet
       val aerospikeRowKey = conf.aerospikeRowKey
       // For each partition of Dataframe, aerospike client is created and is used to write data to aerospike
-      dataFrame.foreachPartition { partition =>
+      dataFrame.foreachPartition { partition: Iterator[Row] =>
         val client = AerospikeAdminClient.createClientConnection(aerospikeHosts, aerospikePort.toInt)
         partition.foreach { row =>
           val bins = columns.map(eachCol => new Bin(eachCol.toString, row.getAs(eachCol).toString)).toArray
diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/writer/AerospikeWriter.scala b/gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/writer/AerospikeWriter.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/src/main/scala/com/paypal/gimel/aerospike/writer/AerospikeWriter.scala
rename to gimel-dataapi/gimel-connectors/gimel-aerospike/src/main/scala/com/paypal/gimel/aerospike/writer/AerospikeWriter.scala
diff --git a/gimel-dataapi/pom.xml b/gimel-dataapi/pom.xml
index 83be5226..2e525efc 100644
--- a/gimel-dataapi/pom.xml
+++ b/gimel-dataapi/pom.xml
@@ -47,7 +47,7 @@ under the License.
         <module>gimel-connectors/gimel-jdbc</module>
         <module>gimel-connectors/gimel-cassandra</module>
         <module>gimel-connectors/gimel-hbase</module>
-        <module>gimel-connectors/gimel-aerospike-3.14</module>
+        <module>gimel-connectors/gimel-aerospike</module>
         <module>gimel-connectors/gimel-druid-0.82</module>
         <module>gimel-core</module>
         <module>gimel-sql</module>