diff --git a/uuf-core/src/main/java/org/wso2/carbon/uuf/internal/io/BundleClassLoaderProvider.java b/uuf-core/src/main/java/org/wso2/carbon/uuf/internal/io/BundleClassLoaderProvider.java
index 11af74e7..7b0c585e 100644
--- a/uuf-core/src/main/java/org/wso2/carbon/uuf/internal/io/BundleClassLoaderProvider.java
+++ b/uuf-core/src/main/java/org/wso2/carbon/uuf/internal/io/BundleClassLoaderProvider.java
@@ -89,7 +89,7 @@ private Bundle getBundle(String componentName, String componentVersion, Componen
     }
 
     private String getBundleVersion(String componentVersion) {
-        return componentVersion.replace("-SNAPSHOT", ".SNAPSHOT");
+        return componentVersion.replace('-', '.').replace('_', '.'); // There shouldn't be any '-' or '_' in version
     }
 
     private List<String> getImports(ComponentReference componentReference) {