=== modified file 'src/com/goldencode/artifacts/ArtifactManager.java'
--- old/src/com/goldencode/artifacts/ArtifactManager.java	2026-04-07 07:12:52 +0000
+++ new/src/com/goldencode/artifacts/ArtifactManager.java	2026-04-16 12:45:44 +0000
@@ -665,7 +665,7 @@
             String resolvedProgram = operation.resolve(file);
             if (resolvedProgram != null)
             {
-               String newRelativePath = getPathToProjectFolder(file, suffix);
+               String newRelativePath = getPathToProjectFolder(resolvedProgram, suffix);
                Artifact newArtifact = addArtifact(newRelativePath);
                convertedArtifacts.add(newArtifact);
             }
@@ -702,8 +702,8 @@
          String resolvedProgram = op.resolve(program);
          if (resolvedProgram != null)
          {
-            String absolutePath = absoluteFilename(program);
-            Artifact artifact = addArtifact(program, absolutePath);
+            String absolutePath = absoluteFilename(resolvedProgram);
+            Artifact artifact = addArtifact(resolvedProgram, absolutePath);
             createdArtifacts.add(artifact);
          }
       }

=== modified file 'src/com/goldencode/p2j/convert/ConversionDriver.java'
--- old/src/com/goldencode/p2j/convert/ConversionDriver.java	2026-04-07 07:12:52 +0000
+++ new/src/com/goldencode/p2j/convert/ConversionDriver.java	2026-04-16 12:39:42 +0000
@@ -735,11 +735,11 @@
          return cfg.getPkg() + "." + javaName;
       };
       
-      Set<String> allCvtFiles = new HashSet<>();
+      Set<String> allCvtFiles = new TreeSet<>();
       List<String> relativeNames = ArtifactManager.getArtifactsRelativePath(asts);
-      for (String file : relativeNames)
+      for (Artifact artifact : asts.getArtifacts())
       {
-         file = FileOperationsWorker.findFile(file, null);
+         String file = artifact.getAbsolutePath();
          allCvtFiles.add(file);
       }
       allCvtFiles.addAll(relativeNames);
@@ -853,6 +853,8 @@
             }
          }
          
+         Collections.sort(proxyFiles);
+         
          if (!proxyFiles.isEmpty())
          {
             ArtifactCollection proxyAsts =

=== modified file 'src/com/goldencode/p2j/convert/GenerateLegacyProxyOpenClient.java'
--- old/src/com/goldencode/p2j/convert/GenerateLegacyProxyOpenClient.java	2025-12-16 13:44:03 +0000
+++ new/src/com/goldencode/p2j/convert/GenerateLegacyProxyOpenClient.java	2026-04-16 09:01:05 +0000
@@ -197,6 +197,7 @@
          {
             Artifact a = proxyIter.next();
             String cvtPath = ArtifactManager.getPathToProjectFolder(a, FileExtensions.AST_POSTFIX);
+            cvtPath = ArtifactManager.normalizeFilename(cvtPath);
             if (astArtifact.getRelativePath().equals(cvtPath))
             {
                ok = true;