Second phase of JarLoader file name fix