diff --git a/jip/parser.py b/jip/parser.py
index a6c030e..9c9368d 100644
--- a/jip/parser.py
+++ b/jip/parser.py
@@ -215,7 +215,7 @@ def loads(path, script_class=None, is_pipeline=False):
         if tool.name is None:
             tool.name = os.path.basename(path)
             try:
-                tool.name = tool.name[:tool.name.index('.')]
+                tool.name = tool.name[:tool.name.rindex('.')].replace(".", "_")
             except:
                 pass
         return tool