diff --git a/.gitignore b/.gitignore index 511855d7..c4a3a3d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.DS_Store *.class build/** diff --git a/.project b/.project index 1353b675..aa78858f 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - ZENCashOfficialSwingWalletUI + ZclassicSwingWallet diff --git a/README.md b/README.md index 3b3acaa3..0fc3ddc5 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,29 @@ -# [ZENCash](https://zensystem.io/) Desktop GUI Wallet +# [Zclassic](https://zclassic.org/) Desktop GUI Wallet -## Graphical user interface wrapper for the [ZENCash](https://zensystem.io/) command line tools +## Graphical user interface wrapper for the [Zclassic](https://zclassic.org/) command line tools + +## Forked from the [ZENCash Swing Wallet](https://github.com/ZencashOfficial/zencash-swing-wallet-ui) ### IMPORTANT: Please read the [security notice](docs/KnownSecurityIssues.md) about watch-only addresses before using the wallet! -This program provides a Graphical User Interface (GUI) for the ZENCash client tools that acts as a wrapper and +This program provides a Graphical User Interface (GUI) for the Zclassic client tools that acts as a wrapper and presents the information in a user-friendly manner. -![Screenshot](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/raw/master/docs/ZENCashWallet.png "Main Window") +![Screenshot](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/raw/master/docs/ZclassicWallet.png "Main Window") -#### New/Experimental: [ZENCash Desktop GUI Wallet packages for Debian/Ubuntu Linux](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/blob/master/docs/ReleaseUbuntuRepository.md) are available +#### New/Experimental: [Zclassic Desktop GUI Wallet packages for Debian/Ubuntu Linux](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/blob/master/docs/ReleaseUbuntuRepository.md) are available -#### New/Experimental: [ZENCash Desktop GUI Wallet for Mac OS](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/blob/master/docs/Release_0.75.9.md) is available +#### New/Experimental: [Zclassic Desktop GUI Wallet for Mac OS](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/blob/master/docs/Release_0.75.9.md) is available -#### New/Experimental: [ZENCash Desktop GUI Wallet for Windows](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/blob/master/docs/Release_0.75.8.md) is available +#### New/Experimental: [Zclassic Desktop GUI Wallet for Windows](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/blob/master/docs/Release_0.75.8.md) is available #### Information on diagnosing some common problems may be found in this [troubleshooting guide](docs/TroubleshootingGuide.md). ## Building, installing and running the Wallet GUI -Before installing the Desktop GUI Wallet you need to have ZENCash up and running. The following +Before installing the Desktop GUI Wallet you need to have Zclassic up and running. The following [guide](https://github.com/ZencashOfficial/zen/blob/master/README.md) -explains how to set up [ZENCash](https://zensystem.io/). +explains how to set up [Zclassic](https://zclassic.org/). **For security reasons it is recommended to always build the GUI wallet program from GitHub** **[source](https://github.com/ZencashOfficial/zencash-swing-wallet-ui/archive/master.zip).** @@ -31,7 +33,7 @@ The details of how to build it are described below (easy to follow). 1. Operating system and tools As of June 2017 (ZENCash v1.0.9) this program is mostly tested on Linux and Mac OS X - (same limitation as [ZENCash](https://zensystem.io/)) with experimental support for Windows. + (same limitation as [Zclassic](https://zclassic.org/)) with experimental support for Windows. The Linux tools you need to build and run the Wallet GUI are Git, Java (JDK7 or later) and Ant. If using Ubuntu Linux, they may be installed via command: ``` @@ -61,37 +63,37 @@ The details of how to build it are described below (easy to follow). ``` user@ubuntu:~/build-dir/zencash-swing-wallet-ui$ ant -buildfile ./src/build/build.xml ``` - This takes a few seconds and when it finishes, it builds a JAR file `./build/jars/ZENCashSwingWalletUI.jar`. + This takes a few seconds and when it finishes, it builds a JAR file `./build/jars/ZclassicSwingWallet.jar`. You need to make this file executable: ``` - user@ubuntu:~/build-dir/zencash-swing-wallet-ui$ chmod u+x ./build/jars/ZENCashSwingWalletUI.jar + user@ubuntu:~/build-dir/zencash-swing-wallet-ui$ chmod u+x ./build/jars/ZclassicSwingWallet.jar ``` At this point the build process is finished the built GUI wallet program is the JAR - file `./build/jars/ZENCashSwingWalletUI.jar`. In addition the JAR file + file `./build/jars/ZclassicSwingWallet.jar`. In addition the JAR file `bitcoinj-core-0.14.5.jar` is also necessary to run the wallet. -3. Installing the built ZENCash GUI wallet +3. Installing the built Zclassic GUI wallet - 3.1. If you have built ZENCash from source code: + 3.1. If you have built Zclassic from source code: - Assuming you have already built from source code [ZENCash](https://zensystem.io/) in directory `/home/user/zen/src` (for example - this is the typical build dir. for ZENCash v1.0.9) which contains the command line tools `zen-cli` and `zend` you need to take the created JAR files and copy them to directory `/home/user/zen/src` (the same dir. that contains `zen-cli` and `zend`). Example copy command: + Assuming you have already built from source code [Zclassic](https://zclassic.org/) in directory `/home/user/zen/src` (for example - this is the typical build dir. for Zclassic v1.0.9) which contains the command line tools `zcl-cli` and `zcld` you need to take the created JAR files and copy them to directory `/home/user/zen/src` (the same dir. that contains `zcl-cli` and `zcld`). Example copy command: ``` user@ubuntu:~/build-dir/zencash-swing-wallet-ui$ cp -R -v ./build/jars/* /home/user/zen/src ``` -4. Running the installed ZENCash GUI wallet +4. Running the installed Zclassic GUI wallet It may be run from command line or started from another GUI tool (e.g. file manager). - Assuming you have already installed [ZENCash](https://zensystem.io/) and the GUI Wallet `ZENCashSwingWalletUI.jar` in + Assuming you have already installed [Zclassic](https://zclassic.org/) and the GUI Wallet `ZclassicSwingWallet.jar` in directory `/home/user/zen/src` one way to run it from command line is: ``` - user@ubuntu:~/build-dir/zencash-swing-wallet-ui$ java -jar /home/user/zen/src/ZENCashSwingWalletUI.jar + user@ubuntu:~/build-dir/zencash-swing-wallet-ui$ java -jar /home/user/zen/src/ZclassicSwingWallet.jar ``` If you are using Ubuntu (or similar ;) Linux you may instead just use the file manager and - right-click on the `ZENCashSwingWalletUI.jar` file and choose the option "Open with OpenJDK 8 Runtime". - This will start the ZENCash GUI wallet. + right-click on the `ZclassicSwingWallet.jar` file and choose the option "Open with OpenJDK 8 Runtime". + This will start the Zclassic GUI wallet. - **Important:** the ZENCash configuration file `~/.zen/zen.conf` needs to be correctly set up for the GUI + **Important:** the Zclassic configuration file `~/.zen/zen.conf` needs to be correctly set up for the GUI wallet to work. Specifically the RPC user and password need to be set in it like: ``` rpcuser=username @@ -115,24 +117,24 @@ SOFTWARE. ### Known issues and limitations -1. Issue: The ZENCash Desktop GUI Wallet is not compatible with applications that modify the ZEN `wallet.dat` file. The wallet should not be used +1. Issue: The Zclassic Desktop GUI Wallet is not compatible with applications that modify the ZEN `wallet.dat` file. The wallet should not be used with such applications on the same PC. For instance some distributed exchange applications are known to create watch-only addresses in the `wallet.dat` file that cause the GUI wallet to display a wrong balance and/or display addresses that do not belong to the wallet. 1. Limitation: if two users exchange text messages via the messaging UI TAB and one of them has a system clock, substantially running slow or fast by more than 1 minute, it is possible that this user will see text messages appearing out of order. -1. Limitation: if a messaging identity has been created (happens on first click on the messaging UI tab), then replacing the `wallet.dat` or changing the node configuration between mainnet and testnet will make the identity invalid. This will result in a wallet update error. To remove the error the directory `~/.ZENCashSwingWalletUI/messaging` may be manually renamed or deleted (when the wallet is stopped). **CAUTION: all messaging history will be lost in this case!** -1. Limitation: Wallet encryption has been temporarily disabled in ZENCash due to stability problems. A corresponding issue +1. Limitation: if a messaging identity has been created (happens on first click on the messaging UI tab), then replacing the `wallet.dat` or changing the node configuration between mainnet and testnet will make the identity invalid. This will result in a wallet update error. To remove the error the directory `~/.ZclassicSwingWallet/messaging` may be manually renamed or deleted (when the wallet is stopped). **CAUTION: all messaging history will be lost in this case!** +1. Limitation: Wallet encryption has been temporarily disabled in Zclassic due to stability problems. A corresponding issue [#1552](https://github.com/zcash/zcash/issues/1552) has been opened by the ZCash developers. Correspondingly -wallet encryption has been temporarily disabled in the ZENCash Desktop GUI Wallet. +wallet encryption has been temporarily disabled in the Zclassic Desktop GUI Wallet. The latter needs to be disabled. 1. Limitation: The list of transactions does not show all outgoing ones (specifically outgoing Z address transactions). A corresponding issue [#1438](https://github.com/zcash/zcash/issues/1438) has been opened for the ZCash developers. -1. Limitation: The CPU percentage shown to be taken by zend on Linux is the average for the entire lifetime +1. Limitation: The CPU percentage shown to be taken by zcld on Linux is the average for the entire lifetime of the process. This is not very useful. This will be improved in future versions. -1. Limitation: When using a natively compiled wallet version (e.g. `ZENCashSwingWalletUI.exe` for Windows) on a +1. Limitation: When using a natively compiled wallet version (e.g. `ZclassicSwingWallet.exe` for Windows) on a very high resolution monitor with a specifically configured DPI scaling (enlargement) factor to make GUI elements look larger, the GUI elements of the wallet actually do not scale as expected. To correct this on -Windows you need to right-click on `ZENCashSwingWalletUI.exe` and choose option: +Windows you need to right-click on `ZclassicSwingWallet.exe` and choose option: ``` Properties >> Compatibility >> Override High DPI scaling behavior >> Scaling Performed by (Application) ``` diff --git a/docs/KnownSecurityIssues.md b/docs/KnownSecurityIssues.md index 6fed0664..c4a0ec26 100644 --- a/docs/KnownSecurityIssues.md +++ b/docs/KnownSecurityIssues.md @@ -1,4 +1,4 @@ -## [ZENCash](https://zensystem.io/) Desktop GUI Wallet known security issues +## [Zclassic](https://zclassic.org/) Desktop GUI Wallet known security issues This document describes various security-related vulnerabilities in the GUI wallet that have become known after release and users should be aware of them! @@ -14,7 +14,7 @@ obtainable then the address belongs to the wallet and its balance is spend-able. ### Compatibility with other applications -The ZENCash Desktop GUI Wallet is not compatible with applications that modify the ZEN `wallet.dat` file. The wallet should not be used +The Zclassic Desktop GUI Wallet is not compatible with applications that modify the ZEN `wallet.dat` file. The wallet should not be used with such applications on the same PC. For instance some distributed exchange applications are known to create watch-only addresses in the `wallet.dat` file that cause the GUI wallet to display a wrong balance and/or display addresses that do not belong to the wallet. diff --git a/docs/ReleaseUbuntuRepository.md b/docs/ReleaseUbuntuRepository.md index 3f375ccd..84346793 100644 --- a/docs/ReleaseUbuntuRepository.md +++ b/docs/ReleaseUbuntuRepository.md @@ -1,13 +1,13 @@ -## [ZENCash](https://zensystem.io/) Desktop GUI Wallet APT repository for Debian/Ubuntu Linux +## [Zclassic](https://zclassic.org/) Desktop GUI Wallet APT repository for Debian/Ubuntu Linux -This is a [ZENCash](https://zensystem.io/) Desktop GUI Wallet made available through a package repository +This is a [Zclassic](https://zclassic.org/) Desktop GUI Wallet made available through a package repository for Debian/Ubuntu (and similar) Linux systems. ### IMPORTANT: Please read the [security notice](KnownSecurityIssues.md) about watch-only addresses before using the wallet! -![Screenshot](ZENCashWalletUbuntu.png "Main Window") +![Screenshot](ZclassicWalletUbuntu.png "Main Window") -### Installing the ZENCash Desktop GUI Wallet on Linux +### Installing the Zclassic Desktop GUI Wallet on Linux To setup the APT repository and install packages, using a terminal run the following commands ``` @@ -33,10 +33,10 @@ Finally you need to download the Z cryptographic keys (takes a while): zen-fetch-params ``` -### Running the ZENCash Desktop GUI Wallet on Linux +### Running the Zclassic Desktop GUI Wallet on Linux -To launch the ZENCash Desktop GUI Wallet you can just search and click on it in the Ubuntu unity menu: -![UnityLauncher](ZENUnityLauncher.png "ZENCash Wallet launcher") +To launch the Zclassic Desktop GUI Wallet you can just search and click on it in the Ubuntu unity menu: +![UnityLauncher](ZENUnityLauncher.png "Zclassic Wallet launcher") ...or alternatively, run the command `zencash-desktop-gui-wallet` from a terminal: ``` @@ -55,14 +55,14 @@ SOFTWARE. ### Known issues and limitations 1. Limitation: if two users exchange text messages via the messaging UI TAB and one of them has a system clock, substantially running slow or fast by more than 1 minute, it is possible that this user will see text messages appearing out of order. -1. Limitation: if a messaging identity has been created (happens on first click on the messaging UI tab), then replacing the `wallet.dat` or changing the node configuration between mainnet and testnet will make the identity invalid. This will result in a wallet update error. To remove the error the directory `~/.ZENCashSwingWalletUI/messaging` may be manually renamed or deleted (when the wallet is stopped). **CAUTION: all messaging history will be lost in this case!** -1. Limitation: Wallet encryption has been temporarily disabled in ZENCash due to stability problems. A corresponding issue +1. Limitation: if a messaging identity has been created (happens on first click on the messaging UI tab), then replacing the `wallet.dat` or changing the node configuration between mainnet and testnet will make the identity invalid. This will result in a wallet update error. To remove the error the directory `~/.ZclassicSwingWallet/messaging` may be manually renamed or deleted (when the wallet is stopped). **CAUTION: all messaging history will be lost in this case!** +1. Limitation: Wallet encryption has been temporarily disabled in Zclassic due to stability problems. A corresponding issue [#1552](https://github.com/zcash/zcash/issues/1552) has been opened by the ZCash developers. Correspondingly -wallet encryption has been temporarily disabled in the ZENCash Desktop GUI Wallet. +wallet encryption has been temporarily disabled in the Zclassic Desktop GUI Wallet. 1. Issue: GUI data tables (transactions/addresses etc.) allow copying of data via double click but also allow editing. The latter needs to be disabled. 1. Limitation: The list of transactions does not show all outgoing ones (specifically outgoing Z address transactions). A corresponding issue [#1438](https://github.com/zcash/zcash/issues/1438) has been opened for the ZCash developers. -1. Limitation: The CPU percentage shown to be taken by zend on Linux is the average for the entire lifetime +1. Limitation: The CPU percentage shown to be taken by zcld on Linux is the average for the entire lifetime of the process. This is not very useful. This will be improved in future versions. diff --git a/docs/TroubleshootingGuide.md b/docs/TroubleshootingGuide.md index 047e61f6..eafca76d 100644 --- a/docs/TroubleshootingGuide.md +++ b/docs/TroubleshootingGuide.md @@ -1,18 +1,18 @@ -## [ZENCash](https://zensystem.io/) Desktop GUI Wallet troubleshooting guide +## [Zclassic](https://zclassic.org/) Desktop GUI Wallet troubleshooting guide -![Screenshot1](ZENChat_small.png "Chat Window") ![Screenshot1](ZENCashWalletMac_0.74.7_small.png "Wallet Window") +![Screenshot1](ZENChat_small.png "Chat Window") ![Screenshot1](ZclassicWalletMac_0.74.7_small.png "Wallet Window") This document outlines possible solutions to several common problems that user might encounter while using the wallet. ### How to diagnose wallet problems -When wallet problems occur, the information about the errors that caused the issue is usually found in the log files written by the wallet itself and also by `zend`. The location of the wallet log files is: +When wallet problems occur, the information about the errors that caused the issue is usually found in the log files written by the wallet itself and also by `zcld`. The location of the wallet log files is: ``` -Linux: ~/.ZENCashSwingWalletUI/ZENCashGUIWallet_xxxx_xx_debug.log -Windows: %LOCALAPPDATA%/ZENCashSwingWalletUI/ZENCashGUIWallet_xxxx_xx_debug.log -Mac OS: ~/Library/Application Support/ZENCashSwingWalletUI/ZENCashGUIWallet_xxxx_xx_debug.log +Linux: ~/.ZclassicSwingWallet/ZclassicGUIWallet_xxxx_xx_debug.log +Windows: %LOCALAPPDATA%/ZclassicSwingWallet/ZclassicGUIWallet_xxxx_xx_debug.log +Mac OS: ~/Library/Application Support/ZclassicSwingWallet/ZclassicGUIWallet_xxxx_xx_debug.log ``` -`zend` that is automatically started by the wallet, stores its logs at locations: +`zcld` that is automatically started by the wallet, stores its logs at locations: ``` Linux: ~/.zen/debug.log, Windows: %APPDATA%/Zen/debug.log @@ -22,23 +22,23 @@ The log files are the first place too look for clues as to the nature of problem ### Common Problem 1 - wallet fails during start up -This kind of problem may have multiple causes but the most frequent one in practice is that `zend` fails to start properly. The latter is in turn most commonly caused by block-chain corruption. This could occur -in rare cases when for instance machines are stopped due to power disruptions, while `zend` is writing data. +This kind of problem may have multiple causes but the most frequent one in practice is that `zcld` fails to start properly. The latter is in turn most commonly caused by block-chain corruption. This could occur +in rare cases when for instance machines are stopped due to power disruptions, while `zcld` is writing data. A common symptom of this problem is an error message like: ![Screenshot1](EOF_error.png "Chat Window") -The reason is usually that `zend` has not started properly and the GUI wallet cannot connect to it. As a start -one may examine the `zend` logs to find the technical details of the problem. One way to fix this problem, that -works in 90%+ of cases is to start `zend` manually with a `-reindex` option from a terminal and start the GUI wallet only after that. The command is: +The reason is usually that `zcld` has not started properly and the GUI wallet cannot connect to it. As a start +one may examine the `zcld` logs to find the technical details of the problem. One way to fix this problem, that +works in 90%+ of cases is to start `zcld` manually with a `-reindex` option from a terminal and start the GUI wallet only after that. The command is: ``` -zend -reindex +zcld -reindex ``` For non-technical users here is some information on how to open a terminal on [Windows](https://www.lifewire.com/how-to-open-command-prompt-2618089) and [Mac OS](https://www.wikihow.com/Open-a-Terminal-Window-in-Mac). The full command on Mac OS is: ``` -/Applications/ZENCashWallet.app/Contents/Java/zend -reindex +/Applications/ZclassicWallet.app/Contents/Java/zcld -reindex ``` -On Windows you first have to locate `zend.exe`. It is in the `/app` sub-directory of the wallet installation. +On Windows you first have to locate `zcld.exe`. It is in the `/app` sub-directory of the wallet installation. ### Disclaimer diff --git a/src/build/build.xml b/src/build/build.xml index ebbb9b48..623b4d13 100644 --- a/src/build/build.xml +++ b/src/build/build.xml @@ -1,11 +1,11 @@ - - + + @@ -42,12 +42,12 @@ - + - + @@ -59,16 +59,16 @@ - + - + - + - - + + @@ -85,7 +85,7 @@ - @@ -93,57 +93,57 @@ - - - + + - - + - + - + - + - + - + - + - + - - - + + + - - - + - - + + @@ -174,7 +174,7 @@ --> - + @@ -182,4 +182,3 @@ - diff --git a/src/java/com/vaklinov/zcashui/AboutDialog.java b/src/java/com/vaklinov/zcashui/AboutDialog.java index a90f9b14..4399102a 100644 --- a/src/java/com/vaklinov/zcashui/AboutDialog.java +++ b/src/java/com/vaklinov/zcashui/AboutDialog.java @@ -50,8 +50,9 @@ /** - * Typical about box stuff... + * About * + * @author Jon Layton * @author Ivan Vaklinov */ public class AboutDialog @@ -60,7 +61,7 @@ public class AboutDialog public AboutDialog(JFrame parent) throws UnsupportedEncodingException { - this.setTitle("About..."); + this.setTitle("About"); this.setSize(620, 440); this.setLocation(100, 100); this.setLocationRelativeTo(parent); @@ -69,9 +70,9 @@ public AboutDialog(JFrame parent) JTabbedPane tabs = new JTabbedPane(); - JPanel copyrigthPanel = new JPanel(); - copyrigthPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - copyrigthPanel.setLayout(new BorderLayout(3, 3)); + JPanel copyrightPanel = new JPanel(); + copyrightPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); + copyrightPanel.setLayout(new BorderLayout(3, 3)); JLabel copyrightLabel = new JLabel(); copyrightLabel.setText(new String(new byte[] { @@ -134,7 +135,7 @@ public AboutDialog(JFrame parent) }, "UTF-8") ); copyrightLabel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)); - copyrigthPanel.add(copyrightLabel, BorderLayout.NORTH); + copyrightPanel.add(copyrightLabel, BorderLayout.NORTH); JPanel PD = new JPanel(); @@ -218,10 +219,10 @@ public void actionPerformed(ActionEvent e) { }); PD2.add(PD3, BorderLayout.EAST); PD.add(PD2, BorderLayout.CENTER); - //copyrigthPanel.add(PD, BorderLayout.CENTER); - no donations stuff for ZEN + //copyrightPanel.add(PD, BorderLayout.CENTER); - tabs.add("About", copyrigthPanel); + tabs.add("About", copyrightPanel); JPanel licensePanel = new JPanel(); licensePanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); @@ -229,6 +230,10 @@ public void actionPerformed(ActionEvent e) { JLabel licenseLabel = new JLabel(); licenseLabel.setText( "
" +
+		    " Copyright (c) 2018 Jon Layton <me@jonl.io> \n" +
+        " Donate ZCL: zcF3db2JwLNHa917NfbfFR2EJWXgowFmQ4bvouJEvGmPjLPcH7hyAhpSAFUhm7ANiBJfzMpJHMkp363r7M3GEC8g8oQXJ5n " +
+			"\n" +
+      "\n" +
 		    " Copyright (c) 2016-2017 Ivan Vaklinov <ivan@vaklinov.com> \n" +
 			"\n" +
 			" Permission is hereby granted, free of charge, to any person obtaining a copy\n" +
diff --git a/src/java/com/vaklinov/zcashui/OSUtil.java b/src/java/com/vaklinov/zcashui/OSUtil.java
index 02f2c1ed..ba84db0f 100644
--- a/src/java/com/vaklinov/zcashui/OSUtil.java
+++ b/src/java/com/vaklinov/zcashui/OSUtil.java
@@ -114,7 +114,7 @@ public static String getZCashd()
 	}
 	
 	
-	// Returns the name of the zen-cli tool - may vary depending on the OS.
+	// Returns the name of the zcl-cli tool - may vary depending on the OS.
 	public static String getZCashCli()
 	{
 		String zcashcli = "zcl-cli";
@@ -135,7 +135,7 @@ public static String getProgramDirectory()
 	{
 		// TODO: this way of finding the dir is JAR name dependent - tricky, may not work
 		// if program is repackaged as different JAR!
-		final String JAR_NAME = "ZclassicSwingWalletUI.jar";
+		final String JAR_NAME = "ZclassicSwingWallet.jar";
 		String cp = System.getProperty("java.class.path");
 		if ((cp != null) && (cp.indexOf(File.pathSeparator) == -1) &&
 			(cp.endsWith(JAR_NAME)))
@@ -221,11 +221,9 @@ public static String getBlockchainDirectory()
 			return new File(System.getProperty("user.home") + "/Library/Application Support/Zclassic").getCanonicalPath();
 		} else if (os == OS_TYPE.WINDOWS)
 		{
-			//todo ch4ot1c?
 			return new File(System.getenv("APPDATA") + "\\Zclassic").getCanonicalPath();
 		} else
 		{
-			//todo ch4ot1c?
 			return new File(System.getProperty("user.home") + "/.zclassic").getCanonicalPath();
 		}
 	}
@@ -241,13 +239,13 @@ public static String getSettingsDirectory()
 	    
 	    if (os == OS_TYPE.MAC_OS)
 	    {
-	        dir = new File(userHome, "Library/Application Support/ZclassicSwingWalletUI");
+	        dir = new File(userHome, "Library/Application Support/ZclassicSwingWallet");
 	    } else if (os == OS_TYPE.WINDOWS)
 		{
-			dir = new File(System.getenv("LOCALAPPDATA") + "\\ZclassicSwingWalletUI");
+			dir = new File(System.getenv("LOCALAPPDATA") + "\\ZclassicSwingWallet");
 		} else
 	    {
-	        dir = new File(userHome.getCanonicalPath() + File.separator + ".ZclassicSwingWalletUI");
+	        dir = new File(userHome.getCanonicalPath() + File.separator + ".ZclassicSwingWallet");
 	    }
 	    
 		if (!dir.exists())
diff --git a/src/java/com/vaklinov/zcashui/ProvingKeyFetcher.java b/src/java/com/vaklinov/zcashui/ProvingKeyFetcher.java
index 95d1ab8d..064d237b 100644
--- a/src/java/com/vaklinov/zcashui/ProvingKeyFetcher.java
+++ b/src/java/com/vaklinov/zcashui/ProvingKeyFetcher.java
@@ -32,8 +32,9 @@ public class ProvingKeyFetcher {
     
     private static final int PROVING_KEY_SIZE = 910173851;
     private static final String SHA256 = "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7";
-    private static final String pathURL = "https://zensystem.io/downloads/sprout-proving.key";
+    private static final String pathURL = "https://z.cash/downloads/sprout-proving.key";
     // TODO: add backups
+    //private static final String altPathURL = "https://zensystem.io/downloads/sprout-proving.key";
     
     public void fetchIfMissing(StartupProgressDialog parent) throws IOException {
         try {
diff --git a/src/java/com/vaklinov/zcashui/SendCashPanel.java b/src/java/com/vaklinov/zcashui/SendCashPanel.java
index e8e5f101..78b422e3 100644
--- a/src/java/com/vaklinov/zcashui/SendCashPanel.java
+++ b/src/java/com/vaklinov/zcashui/SendCashPanel.java
@@ -126,7 +126,7 @@ public SendCashPanel(ZCashClientCaller clientCaller,
 		sendCashPanel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
 		
 		JPanel tempPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-		tempPanel.add(new JLabel("Send cash from:       "));
+		tempPanel.add(new JLabel("Send ZCL from:       "));
 		tempPanel.add(new JLabel(
 			"" +
 			"* Only addresses with a confirmed balance are shown as sources for sending!" +
diff --git a/src/java/com/vaklinov/zcashui/StatusUpdateErrorReporter.java b/src/java/com/vaklinov/zcashui/StatusUpdateErrorReporter.java
index bacb556e..76577981 100644
--- a/src/java/com/vaklinov/zcashui/StatusUpdateErrorReporter.java
+++ b/src/java/com/vaklinov/zcashui/StatusUpdateErrorReporter.java
@@ -69,7 +69,7 @@ public void reportError(Exception e, boolean isDueToAutomaticUpdate)
 			lastReportedErrroTime = time;
 		}
 		
-		String settingsDirectory = ".ZclassicSwingWalletUI";
+		String settingsDirectory = ".ZclassicSwingWallet";
 		
 		try
 		{
diff --git a/src/java/com/vaklinov/zcashui/WalletOperations.java b/src/java/com/vaklinov/zcashui/WalletOperations.java
index 43875c93..b259c5a4 100644
--- a/src/java/com/vaklinov/zcashui/WalletOperations.java
+++ b/src/java/com/vaklinov/zcashui/WalletOperations.java
@@ -354,7 +354,7 @@ public void showPrivateKey()
 		{
 			JOptionPane.showMessageDialog(
 				this.parent, 
-				"Please select an address in the \"Own addresses\" tab " +
+				"Please select an address in the \"My Addresses\" tab " +
 				"to view its private key",
 				"Please select an address...", JOptionPane.INFORMATION_MESSAGE);
 			this.tabs.setSelectedIndex(1);
diff --git a/src/java/com/vaklinov/zcashui/ZCashInstallationObserver.java b/src/java/com/vaklinov/zcashui/ZCashInstallationObserver.java
index 0aaad8f5..8e7be683 100644
--- a/src/java/com/vaklinov/zcashui/ZCashInstallationObserver.java
+++ b/src/java/com/vaklinov/zcashui/ZCashInstallationObserver.java
@@ -97,7 +97,7 @@ public ZCashInstallationObserver(String installDir)
 			throw new InstallationDetectionException(
 				"The Zclassic GUI Wallet installation directory " + installDir + " needs\nto contain " +
 				"the command line utilities zcld and zcl-cli. At least one of them is missing! \n" +
-				"Please place files ZclassicSwingWalletUI.jar, " + OSUtil.getZCashCli() + ", " + 
+				"Please place files ZclassicSwingWallet.jar, " + OSUtil.getZCashCli() + ", " + 
 				OSUtil.getZCashd() + " in the same directory.");
 		}
 	}
diff --git a/src/java/com/vaklinov/zcashui/ZCashUI.java b/src/java/com/vaklinov/zcashui/ZCashUI.java
index 114866cb..af81ccf4 100644
--- a/src/java/com/vaklinov/zcashui/ZCashUI.java
+++ b/src/java/com/vaklinov/zcashui/ZCashUI.java
@@ -79,7 +79,7 @@
 
 
 /**
- * Main ZENCash Window.
+ * Main Zclassic Window.
  *
  * @author Ivan Vaklinov 
  */
@@ -154,13 +154,13 @@ public ZCashUI(StartupProgressDialog progressDialog)
 				new ImageIcon(cl.getResource("images/overview.png")),
 				dashboard = new DashboardPanel(this, installationObserver, clientCaller, 
 						errorReporter, backupTracker));
-		tabs.addTab("Own addresses ",
+		tabs.addTab("My Addresses ",
 				new ImageIcon(cl.getResource("images/own-addresses.png")),
 				addresses = new AddressesPanel(this, clientCaller, errorReporter));
-		tabs.addTab("Send cash ",
+		tabs.addTab("Send ZCL ",
 				new ImageIcon(cl.getResource("images/send.png")),
 				sendPanel = new SendCashPanel(clientCaller, errorReporter, installationObserver, backupTracker));
-		tabs.addTab("Address book ",
+		tabs.addTab("Address Book ",
 				new ImageIcon(cl.getResource("images/address-book.png")),
 				addressBookPanel = new AddressBookPanel(sendPanel, tabs));
 		tabs.addTab("Messaging ",
@@ -219,9 +219,9 @@ public ZCashUI(StartupProgressDialog progressDialog)
 
 		JMenu messaging = new JMenu("Messaging");
 		messaging.setMnemonic(KeyEvent.VK_S);
-		messaging.add(menuItemOwnIdentity = new JMenuItem("Own identity...", KeyEvent.VK_D));
+		messaging.add(menuItemOwnIdentity = new JMenuItem("My Identity...", KeyEvent.VK_D));
 		menuItemOwnIdentity.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, accelaratorKeyMask));        
-		messaging.add(menuItemExportOwnIdentity = new JMenuItem("Export own identity...", KeyEvent.VK_X));
+		messaging.add(menuItemExportOwnIdentity = new JMenuItem("Export my identity...", KeyEvent.VK_X));
 		menuItemExportOwnIdentity.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, accelaratorKeyMask));        
 		messaging.add(menuItemAddMessagingGroup = new JMenuItem("Add messaging group...", KeyEvent.VK_G));
 		menuItemAddMessagingGroup.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, accelaratorKeyMask));
@@ -480,7 +480,7 @@ public void run()
 								"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n" +
 								"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n" +
 								"THE SOFTWARE.\n\n" +
-								"(This message will be shown only once, per release)",
+								"(This message will only be shown once per release)",
 								"Disclaimer", JOptionPane.INFORMATION_MESSAGE);
 			}
 		});
@@ -608,7 +608,7 @@ public static void main(String argv[])
 			if ((zcashdInfo.status != DAEMON_STATUS.RUNNING) || (daemonStartInProgress))
 			{
 				Log.info(
-						"zcld is not runing at the moment or has not started/synchronized 100% - showing splash...");
+						"zcld is not running at the moment or has not started/synchronized 100% - showing splash...");
 				startupBar = new StartupProgressDialog(initialClientCaller);
 				startupBar.setVisible(true);
 				startupBar.waitForStartup();
diff --git a/src/java/com/vaklinov/zcashui/msg/JContactListPanel.java b/src/java/com/vaklinov/zcashui/msg/JContactListPanel.java
index 235902c4..29e1db1f 100644
--- a/src/java/com/vaklinov/zcashui/msg/JContactListPanel.java
+++ b/src/java/com/vaklinov/zcashui/msg/JContactListPanel.java
@@ -82,7 +82,7 @@ public class JContactListPanel
 	extends JPanel
 {
 	private MessagingPanel   parent;
-	private MessagingStorage mesagingStorage;
+	private MessagingStorage messagingStorage;
 	private ContactList      list;
 	private StatusUpdateErrorReporter errorReporter;
 	private JFrame           parentFrame;
@@ -99,13 +99,13 @@ public JContactListPanel(MessagingPanel parent,
 		
 		this.parent = parent;
 		this.parentFrame     = parentFrame;
-		this.mesagingStorage = messagingStorage;
+		this.messagingStorage = messagingStorage;
 		this.errorReporter   = errorReporter;
 		
 		this.setLayout(new BorderLayout(0, 0));
 		
 		list = new ContactList();
-		list.setIdentities(this.mesagingStorage.getContactIdentities(true));
+		list.setIdentities(this.messagingStorage.getContactIdentities(true));
 		this.add(new JScrollPane(list), BorderLayout.CENTER);
 		
 		JPanel upperPanel = new JPanel(new BorderLayout(0, 0));
@@ -322,7 +322,7 @@ public void sendContactDetailsToSelectedContact()
 	public void reloadMessagingIdentities()
 		throws IOException
 	{
-		list.setIdentities(this.mesagingStorage.getContactIdentities(true));
+		list.setIdentities(this.messagingStorage.getContactIdentities(true));
 		list.revalidate();
 	}
 	
diff --git a/src/java/com/vaklinov/zcashui/msg/MessagingIdentity.java b/src/java/com/vaklinov/zcashui/msg/MessagingIdentity.java
index f1d11755..a869ab95 100644
--- a/src/java/com/vaklinov/zcashui/msg/MessagingIdentity.java
+++ b/src/java/com/vaklinov/zcashui/msg/MessagingIdentity.java
@@ -151,7 +151,7 @@ public void copyFromJSONObject(JsonObject obj)
 	}
 	
 	
-	public JsonObject toJSONObject(boolean bForMesagingProtocol)
+	public JsonObject toJSONObject(boolean bForMessagingProtocol)
 	{
 		JsonObject obj = new JsonObject();
 		
@@ -166,7 +166,7 @@ public JsonObject toJSONObject(boolean bForMesagingProtocol)
 		obj.set("facebook",           nonNull(facebook));		
 		obj.set("twitter",            nonNull(twitter));
 		
-		if (!bForMesagingProtocol)
+		if (!bForMessagingProtocol)
 		{
 			obj.set("isanonymous",    isAnonymous);
 			obj.set("isgroup",        isGroup);
diff --git a/src/java/com/vaklinov/zcashui/msg/MessagingPanel.java b/src/java/com/vaklinov/zcashui/msg/MessagingPanel.java
index 99c39709..3608a75f 100644
--- a/src/java/com/vaklinov/zcashui/msg/MessagingPanel.java
+++ b/src/java/com/vaklinov/zcashui/msg/MessagingPanel.java
@@ -122,7 +122,7 @@ public class MessagingPanel
 	
 	private Timer operationStatusTimer = null;
 	
-	private DataGatheringThread receivedMesagesGatheringThread = null;
+	private DataGatheringThread receivedMessagesGatheringThread = null;
 	
 	private Long lastTaddressCheckTime = null;
 	
@@ -252,7 +252,7 @@ public void actionPerformed(ActionEvent e)
 		});
 				
 		// Start the thread to periodically gather messages
-		this.receivedMesagesGatheringThread = new DataGatheringThread(
+		this.receivedMessagesGatheringThread = new DataGatheringThread(
 			new DataGatheringThread.DataGatherer() 
 			{
 				public String[][] gatherData()
@@ -269,7 +269,7 @@ public String[][] gatherData()
 				}
 			}, 
 			this.errorReporter, 45 * 1000, true);
-		this.threads.add(receivedMesagesGatheringThread);
+		this.threads.add(receivedMessagesGatheringThread);
 	}
 	
 	
@@ -340,7 +340,7 @@ public void handleURL(URL u)
 		        	MessagingPanel.this.parentFrame, 
 			        messageStart + "\n" + 
 			        "If you believe this user is spamming the group conversation, you have the option to\n" +
-			        "ignore all his mesages. \n\n" + 
+			        "ignore all his messages. \n\n" + 
 			        "WARNING: If you choose to ignore this user's messages, you will not be able to see \n"+
 			        "any new messages he sends from this point forward!", 
 			        "Possibly ignore user messages?", 
@@ -388,9 +388,9 @@ public void displayMessagesForContact(MessagingIdentity contact)
 		for (Message msg : messages)
 		{
 			// Skip messages sent to a group from ignored IDs.
-			String mesageIDToCheck = msg.isAnonymous() ? msg.getThreadID() : msg.getFrom();
+			String messageIDToCheck = msg.isAnonymous() ? msg.getThreadID() : msg.getFrom();
 			if (contact.isGroup() && (msg.getDirection() == DIRECTION_TYPE.RECEIVED) &&
-				this.messagingStorage.isSenderIdentityIgnoredForGroup(mesageIDToCheck, contact))
+				this.messagingStorage.isSenderIdentityIgnoredForGroup(messageIDToCheck, contact))
 			{
 				Log.warningOneTime("Ignoring message sent to group {1} due to user preference: {0}",
 						           msg.toJSONObject(false).toString(), contact.getDiplayString());
@@ -514,7 +514,7 @@ public void displayMessagesForContact(MessagingIdentity contact)
 	
 
 	/**
-	 * Called when the TAB is selected - currently shows the welcome mesage
+	 * Called when the TAB is selected - currently shows the welcome message
 	 */
 	public void tabSelected()
 	{
@@ -524,15 +524,15 @@ public void tabSelected()
 			{
 		        JOptionPane.showMessageDialog(
 	                this.parentFrame,
-	                "Welcome to Zclassic messaging. As a start you will need to create a new messaging\n" + 
-	                "identity for yourself. As a part of this mesaging identity a pair of T+Z addresses\n" +
+	                "Welcome to Zclassic Messaging. As a start you will need to create a new messaging\n" + 
+	                "identity for yourself. As a part of this messaging identity a pair of T+Z addresses\n" +
 	                "will be created. The T address is to be used for identifying you to other users.\n" +
 	                "It must never be used for other financial transactions since this might reduce or\n" +
 	                "fully compromise your privacy. The Z address is to be used to send and receive\n" +
 	                "messages.\n\n" +
 	                "When creating a new messaging identity it is only mandatory to specify a nick-name\n" +
 	                "for yourself. All other items such as names/addresses etc. are optional. The \n" +
-	                "information in the mesaging identity is meant to be shared with other users so \n" +
+	                "information in the messaging identity is meant to be shared with other users so \n" +
 	                "you need to be careful about the details you disclose.\n\n" +
 	                "Once your messaging identity has been created you can export it to a file using the\n" +
 	                "menu option Messaging >> Export own identity. This file may then be shared with\n" +
@@ -542,8 +542,8 @@ public void tabSelected()
 	                "Your messaging history will be saved and maintained in directory:\n" +
 	                OSUtil.getSettingsDirectory() + File.separator + "messaging" + "\n" +
 	                "You need to ensure that no unauthorized users have access to it on this computer.\n\n" +
-	                "(This mesage will be shown only once.)",
-	                "Welcome to messaging", JOptionPane.INFORMATION_MESSAGE);
+	                "(This message will only be shown once.)",
+	                "Welcome to Messaging", JOptionPane.INFORMATION_MESSAGE);
 		        	        
 		        // Show the GUI dialog to edit an initially empty messaging identity
 		        boolean identityCreated = this.openOwnIdentityDialog();
@@ -592,7 +592,7 @@ public void tabSelected()
 					return;
 				}
 				
-				// Own identity exists, check balance of T address !!! - must be none
+				// My Identity exists, check balance of T address !!! - must be none
 				MessagingIdentity ownIdentity =  this.messagingStorage.getOwnIdentity();
 				Cursor oldCursor = this.parentFrame.getCursor();
 				String balance = null;
@@ -723,7 +723,7 @@ public void exportOwnIdentity()
 		        JOptionPane.showMessageDialog(
 	        		this.parentFrame,
 	        		"Your messaging identity is missing! Maybe it has not been created yet.\n" +
-	        		"Use the menu option \"Messaging >> Own identity\" to crate it!", 
+	        		"Use the menu option \"Messaging >> My Identity\" to crate it!", 
 	        		"Messaging identity is not available", JOptionPane.ERROR_MESSAGE);
 		        return;
 			}
@@ -1539,10 +1539,10 @@ private void collectAndStoreNewReceivedMessages(MessagingIdentity groupIdentity)
 					MessagingPanel.this.getRootPane().getParent(), 
 					"The messaging identity send/receive address: \n" +
 					ownZAddress + "\n" +
-					"is not found in the wallet.dat. The reason may be that after a mesaging identity\n" +
+					"is not found in the wallet.dat. The reason may be that after a messaging identity\n" +
 					"was created the wallet.dat was changed or the ZCL node configuration was changed\n" +
 					"(e.g. mainnet -> testnet). If such a change was made, the messaging identity can no\n" +
-					"longer be used. To avoid this error mesage, you may rename the directory:\n" +
+					"longer be used. To avoid this error message, you may rename the directory:\n" +
 					OSUtil.getSettingsDirectory() + File.separator + "messaging" + "\n" +
 					"until the configuration or wallet.dat is restored! Directory may only be renamed when\n" +
 					"the wallet is stopped!", 
@@ -1624,7 +1624,7 @@ private void collectAndStoreNewReceivedMessages(MessagingIdentity groupIdentity)
 					{
 						// Warn of unexpected message content
 						Log.warningOneTime(
-							"Ignoring received mesage with invalid or incomplete content: {0}",
+							"Ignoring received message with invalid or incomplete content: {0}",
 							jsonMessage.toString());
 					}
 				}	
diff --git a/src/java/com/vaklinov/zcashui/msg/MessagingStorage.java b/src/java/com/vaklinov/zcashui/msg/MessagingStorage.java
index 4f135d00..7cb0305f 100644
--- a/src/java/com/vaklinov/zcashui/msg/MessagingStorage.java
+++ b/src/java/com/vaklinov/zcashui/msg/MessagingStorage.java
@@ -60,17 +60,17 @@
  * Stores the information about messages, identities etc in a dir structure. 
  * The standard directories are:
  * 
- * ~/.ZENCashSwingWalletUI/messaging - root dir
- * ~/.ZENCashSwingWalletUI/messaging/messagingoptions.json - options
- * ~/.ZENCashSwingWalletUI/messaging/ownidentity.json - own identity
- * ~/.ZENCashSwingWalletUI/messaging/ownidentity.json.bak.1 - own identity most recent backup
- * ~/.ZENCashSwingWalletUI/messaging/ownidentity.json.bak.9 - own identity oldest backup
- * ~/.ZENCashSwingWalletUI/messaging/contact_XXXX - a single contact named 0000 to 9999
- * ~/.ZENCashSwingWalletUI/messaging/contact_XXXX/identity.json - contact's identity
- * ~/.ZENCashSwingWalletUI/messaging/contact_XXXX/sent - sent messages dir
- * ~/.ZENCashSwingWalletUI/messaging/contact_XXXX/received - received messages dir
- * ~/.ZENCashSwingWalletUI/messaging/ignored_contacts - dir where ignored msg identities reside
- * ~/.ZENCashSwingWalletUI/messaging/ignored_contacts/UUID.json - single ignored identity.
+ * ~/.ZclassicSwingWallet/messaging - root dir
+ * ~/.ZclassicSwingWallet/messaging/messagingoptions.json - options
+ * ~/.ZclassicSwingWallet/messaging/ownidentity.json - own identity
+ * ~/.ZclassicSwingWallet/messaging/ownidentity.json.bak.1 - own identity most recent backup
+ * ~/.ZclassicSwingWallet/messaging/ownidentity.json.bak.9 - own identity oldest backup
+ * ~/.ZclassicSwingWallet/messaging/contact_XXXX - a single contact named 0000 to 9999
+ * ~/.ZclassicSwingWallet/messaging/contact_XXXX/identity.json - contact's identity
+ * ~/.ZclassicSwingWallet/messaging/contact_XXXX/sent - sent messages dir
+ * ~/.ZclassicSwingWallet/messaging/contact_XXXX/received - received messages dir
+ * ~/.ZclassicSwingWallet/messaging/ignored_contacts - dir where ignored msg identities reside
+ * ~/.ZclassicSwingWallet/messaging/ignored_contacts/UUID.json - single ignored identity.
  * 
  * The sent/received directories have a substructure of type:
  * sent/XXXX/message_xxx.json - where XXXX is between 0000 and 9999, xxx is between 000 and 999 
@@ -660,7 +660,7 @@ public boolean accept(File pathname)
 	
 	// Stores the details of a single contact
 	// Root dir may be like:
-	// ~/.ZENCashSwingWalletUI/messaging/contact_XXXX
+	// ~/.ZclassicSwingWallet/messaging/contact_XXXX
 	static class SingleContactStorage
 	{
 		final String IGNORED_GROUP_IDS = "ignored_group_ids.json";
@@ -870,7 +870,7 @@ public File getRootDir()
 	
 	// Stores messages of one type - sent/received for one contact
 	// Root directory may be like:
-	// ~/.ZENCashSwingWalletUI/messaging/contact_XXXX/sent
+	// ~/.ZclassicSwingWallet/messaging/contact_XXXX/sent
 	static class SentOrReceivedMessagesStore
 	{
 		private File rootDir;
diff --git a/src/resources/ubuntu-package/ZCL-icon.png b/src/resources/ubuntu-package/ZCL-icon.png
new file mode 100644
index 00000000..545d4907
Binary files /dev/null and b/src/resources/ubuntu-package/ZCL-icon.png differ
diff --git a/src/resources/ubuntu-package/ZENCashWallet.desktop b/src/resources/ubuntu-package/ZclassicWallet.desktop
similarity index 61%
rename from src/resources/ubuntu-package/ZENCashWallet.desktop
rename to src/resources/ubuntu-package/ZclassicWallet.desktop
index fd5cdc11..71caafcc 100644
--- a/src/resources/ubuntu-package/ZENCashWallet.desktop
+++ b/src/resources/ubuntu-package/ZclassicWallet.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Version=1.0
+Version=0.0.1
 Name=Zclassic Wallet
 Comment=Zclassic Desktop GUI Wallet (full node)
 GenericName=Zclassic Wallet
-Keywords=Zclassic;Crypto-currency;ZCL;
-Exec=zencash-desktop-gui-wallet
+Keywords=Zclassic;cryptocurrency;ZCL;
+Exec=zclassic-desktop-gui-wallet
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=/usr/lib/zencash-gui-wallet/ZEN-icon.png
+Icon=/usr/lib/zclassic-gui-wallet/ZCL-icon.png
 Categories=GNOME;Application;
 StartupNotify=true
diff --git a/src/resources/ubuntu-package/control b/src/resources/ubuntu-package/control
index 0db510bc..c1c64d1b 100644
--- a/src/resources/ubuntu-package/control
+++ b/src/resources/ubuntu-package/control
@@ -1,8 +1,8 @@
-Package: zencash-desktop-gui-wallet
-Version: 0.75.9
+Package: zclassic-desktop-gui-wallet
+Version: 0.0.1
 Section: misc
 Priority: low
 Architecture: all
-Description: ZENCash Desktop GUI Wallet 
-Maintainer: ivan@vaklinov.com
-Depends: default-jdk, zen
+Description: Zclassic Desktop GUI Wallet
+Maintainer: zclassic.org
+Depends: default-jdk, zcl
diff --git a/src/resources/ubuntu-package/zencash-desktop-gui-wallet b/src/resources/ubuntu-package/zclassic-desktop-gui-wallet
similarity index 83%
rename from src/resources/ubuntu-package/zencash-desktop-gui-wallet
rename to src/resources/ubuntu-package/zclassic-desktop-gui-wallet
index 966c70b1..82b3f771 100644
--- a/src/resources/ubuntu-package/zencash-desktop-gui-wallet
+++ b/src/resources/ubuntu-package/zclassic-desktop-gui-wallet
@@ -1,31 +1,31 @@
 #!/bin/bash
 
-#    ____________ _   _  _____          _      _____ _    _ _______          __   _ _      _   
-#   |___  /  ____| \ | |/ ____|        | |    / ____| |  | |_   _\ \        / /  | | |    | |  
-#      / /| |__  |  \| | |     __ _ ___| |__ | |  __| |  | | | |  \ \  /\  / /_ _| | | ___| |_ 
+#    ____________ _   _  _____          _      _____ _    _ _______          __   _ _      _
+#   |___  /  ____| \ | |/ ____|        | |    / ____| |  | |_   _\ \        / /  | | |    | |
+#      / /| |__  |  \| | |     __ _ ___| |__ | |  __| |  | | | |  \ \  /\  / /_ _| | | ___| |_
 #     / / |  __| | . ` | |    / _` / __| '_ \| | |_ | |  | | | |   \ \/  \/ / _` | | |/ _ \ __|
-#    / /__| |____| |\  | |___| (_| \__ \ | | | |__| | |__| |_| |_   \  /\  / (_| | | |  __/ |_ 
+#    / /__| |____| |\  | |___| (_| \__ \ | | | |__| | |__| |_| |_   \  /\  / (_| | | |  __/ |_
 #   /_____|______|_| \_|\_____\__,_|___/_| |_|\_____|\____/|_____|   \/  \/ \__,_|_|_|\___|\__|
-#                                        
+#
 #  Copyright (c) 2017 Ivan Vaklinov 
-# 
+#
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
 #  in the Software without restriction, including without limitation the rights
 #  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 #  copies of the Software, and to permit persons to whom the Software is
 #  furnished to do so, subject to the following conditions:
-#  
+#
 #  The above copyright notice and this permission notice shall be included in
 #  all copies or substantial portions of the Software.
-#  
+#
 #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 #  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 #  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.                                    
-# 
+#  THE SOFTWARE.
+#
 
-java -jar /usr/lib/zencash-gui-wallet/ZENCashSwingWalletUI.jar
+java -jar /usr/lib/zclassic-gui-wallet/ZclassicSwingWallet.jar