diff --git a/iast-core/src/main/java/com/secnium/iast/core/enhance/IASTContext.java b/iast-core/src/main/java/com/secnium/iast/core/enhance/IastContext.java
similarity index 100%
rename from iast-core/src/main/java/com/secnium/iast/core/enhance/IASTContext.java
rename to iast-core/src/main/java/com/secnium/iast/core/enhance/IastContext.java
diff --git a/iast-core/src/main/java/com/secnium/iast/core/enhance/sca/SCAScanner.java b/iast-core/src/main/java/com/secnium/iast/core/enhance/sca/ScaScanner.java
similarity index 94%
rename from iast-core/src/main/java/com/secnium/iast/core/enhance/sca/SCAScanner.java
rename to iast-core/src/main/java/com/secnium/iast/core/enhance/sca/ScaScanner.java
index a0a1bdb30..a90539853 100644
--- a/iast-core/src/main/java/com/secnium/iast/core/enhance/sca/SCAScanner.java
+++ b/iast-core/src/main/java/com/secnium/iast/core/enhance/sca/ScaScanner.java
@@ -24,7 +24,7 @@ public static void scan(File file) {
             if (file.exists()) {
                 String packageName = file.getName();
                 String signature = SignatureAlgorithm.getSignature(file, ScaScanner.ALGORITHM);
-                if (null != packageName && null != signature) {
+                if (null != signature) {
                     AssestReport.sendReport(filePath, packageName, signature, ScaScanner.ALGORITHM);
                 }
             }
@@ -51,7 +51,7 @@ public static void scanWithJarPackage(String path) {
                     InputStream is = getJarInputStream(path, entryName);
                     String signature = SignatureAlgorithm.getSignature(is, ScaScanner.ALGORITHM);
                     String packageName = entry.getName();
-                    if (null != packageName && null != signature) {
+                    if (null != signature) {
                         AssestReport.sendReport("jar:file:" + path + "!/" + entryName, packageName, signature, ScaScanner.ALGORITHM);
                     }
                 }
diff --git a/iast-core/src/main/java/com/secnium/iast/core/handler/models/IASTPropagatorModel.java b/iast-core/src/main/java/com/secnium/iast/core/handler/models/IastPropagatorModel.java
similarity index 100%
rename from iast-core/src/main/java/com/secnium/iast/core/handler/models/IASTPropagatorModel.java
rename to iast-core/src/main/java/com/secnium/iast/core/handler/models/IastPropagatorModel.java
diff --git a/iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IASTAppName.java b/iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IastAppName.java
similarity index 100%
rename from iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IASTAppName.java
rename to iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IastAppName.java
diff --git a/iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IASTResponseCache.java b/iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IastResponseCache.java
similarity index 100%
rename from iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IASTResponseCache.java
rename to iast-core/src/main/java/com/secnium/iast/core/threadlocalpool/IastResponseCache.java