diff --git a/generate-swagger-file/Main.hs b/app/generate-swagger/Main.hs
similarity index 100%
rename from generate-swagger-file/Main.hs
rename to app/generate-swagger/Main.hs
diff --git a/generate-swagger-file/README.md b/app/generate-swagger/README.md
similarity index 100%
rename from generate-swagger-file/README.md
rename to app/generate-swagger/README.md
diff --git a/server/Main.hs b/app/server/Main.hs
similarity index 100%
rename from server/Main.hs
rename to app/server/Main.hs
diff --git a/cardano-wallet.cabal b/cardano-wallet.cabal
index 4ef87b8e5..05bb8281d 100644
--- a/cardano-wallet.cabal
+++ b/cardano-wallet.cabal
@@ -266,7 +266,7 @@ library
 
 
 
-executable cardano-node
+executable cardano-wallet-server
   default-language:
       Haskell2010
   default-extensions:
@@ -300,12 +300,12 @@ executable cardano-node
     , universum
 
   hs-source-dirs:
-      server
+      app/server
   main-is:
       Main.hs
 
 
-executable cardano-generate-swagger-file
+executable cardano-wallet-generate-swagger
   default-language:
       Haskell2010
   default-extensions:
@@ -335,7 +335,7 @@ executable cardano-generate-swagger-file
     , universum >= 0.1.11
 
   hs-source-dirs:
-      generate-swagger-file
+      app/generate-swagger
   main-is:
       Main.hs
 
diff --git a/src/Cardano/Wallet/Server/CLI.hs b/src/Cardano/Wallet/Server/CLI.hs
index 83bdf77d1..9ddc5fb5f 100644
--- a/src/Cardano/Wallet/Server/CLI.hs
+++ b/src/Cardano/Wallet/Server/CLI.hs
@@ -117,7 +117,7 @@ getWalletNodeOptions = execParser programInfo
                  <> footerDoc CLI.usageExample
 
     versionOption = infoOption
-        ("cardano-node-" <> showVersion version <>
+        ("cardano-wallet-server-" <> showVersion version <>
          ", git revision " <> toString (ctiGitRevision compileInfo))
         (long "version" <> help "Show version.")