Directory structure is not consistent between server and client

The new directory structure for servers sometimes isn't consistent with the one already established in Minecraft Launcher. Now, I acknowledge that isn't super important or anything, but it just struck me as something that probably wasn't intentional. The following is client vs. server:

/versions/1.18-pre1/1.18-pre1.jar
/versions/1.18 Pre-release 1/server-1.18 Pre-release 1.jar

The file path can also show up in console, and in it's current state, it makes it harder to read. The following is expected vs. actual:

Unpacking 1.18-pre1/server-1.18-pre1.jar (versions:1.18-pre1) to versions/1.18-pre1/server-1.18-pre1.jar
Unpacking 1.18 Pre-release 1/server-1.18 Pre-release 1.jar (versions:1.18 Pre-release 1) to versions/1.18 Pre-release 1/server-1.18 Pre-release 1.jar