rename all packages and other names from bisq to haveno

common/src/main/java/haveno/common/ClockWatcher.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 import javax.inject.Singleton;
 

common/src/main/java/haveno/common/Envelope.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 /**
  * Interface for the outside envelope object sent over the network or persisted to disk.

common/src/main/java/haveno/common/FrameRateTimer.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 import java.time.Duration;
 

common/src/main/java/haveno/common/HavenoException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 public class HavenoException extends RuntimeException {
 

common/src/main/java/haveno/common/MasterTimer.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 import java.util.Set;
 import java.util.TimerTask;

common/src/main/java/haveno/common/Payload.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 /**
  * Interface for objects used inside an Envelope or other Payloads.

common/src/main/java/haveno/common/Proto.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 import com.google.protobuf.Message;
 

common/src/main/java/haveno/common/Timer.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 import java.time.Duration;
 

common/src/main/java/haveno/common/UserThread.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common;
+package haveno.common;
 
 import com.google.common.util.concurrent.MoreExecutors;
 

common/src/main/java/haveno/common/app/AppModule.java

@@ -15,13 +15,11 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
-
-import bisq.common.config.Config;
+package haveno.common.app;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
-
+import haveno.common.config.Config;
 import java.util.ArrayList;
 import java.util.List;
 

common/src/main/java/haveno/common/app/AsciiLogo.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/haveno/common/app/Capabilities.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 import com.google.common.base.Joiner;
 

common/src/main/java/haveno/common/app/Capability.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 // We can define here special features the client is supporting.
 // Useful for updates to new versions where a new data type would break backwards compatibility or to

common/src/main/java/haveno/common/app/DevEnv.java

@@ -15,10 +15,9 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
-
-import bisq.common.config.Config;
+package haveno.common.app;
 
+import haveno.common.config.Config;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

common/src/main/java/haveno/common/app/HasCapabilities.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 /**
  * Holds a set of {@link Capabilities}.

common/src/main/java/haveno/common/app/Log.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 import org.slf4j.LoggerFactory;
 

common/src/main/java/haveno/common/app/Version.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 import java.util.Arrays;
 import java.util.List;
@@ -90,7 +90,7 @@ public class Version {
     // A taker will check the version of the offers to see if his version is compatible.
     // For the switch to version 2, offers created with the old version will become invalid and have to be canceled.
     // For the switch to version 3, offers created with the old version can be migrated to version 3 just by opening
-    // the Bisq app.
+    // the Haveno app.
     // VERSION = 0.0.1 -> TRADE_PROTOCOL_VERSION = 1
     public static final int TRADE_PROTOCOL_VERSION = 1;
     private static String p2pMessageVersion;

common/src/main/java/haveno/common/config/BaseCurrencyNetwork.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.config;
+package haveno.common.config;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.params.MainNetParams;

common/src/main/java/haveno/common/config/CompositeOptionSet.java

@@ -1,4 +1,4 @@
-package bisq.common.config;
+package haveno.common.config;
 
 import joptsimple.ArgumentAcceptingOptionSpec;
 import joptsimple.OptionSet;

common/src/main/java/haveno/common/config/Config.java

@@ -1,4 +1,4 @@
-package bisq.common.config;
+package haveno.common.config;
 
 import org.bitcoinj.core.NetworkParameters;
 
@@ -32,12 +32,12 @@ import static java.lang.String.format;
 import static java.util.stream.Collectors.toList;
 
 /**
- * Parses and provides access to all Bisq configuration options specified at the command
+ * Parses and provides access to all Haveno configuration options specified at the command
  * line and/or via the {@value DEFAULT_CONFIG_FILE_NAME} config file, including any
  * default values. Constructing a {@link Config} instance is generally side-effect free,
  * with one key exception being that {@value APP_DATA_DIR} and its subdirectories will
  * be created if they do not already exist. Care is taken to avoid inadvertent creation or
- * modification of the actual system user data directory and/or the production Bisq
+ * modification of the actual system user data directory and/or the production Haveno
  * application data directory. Calling code must explicitly specify these values; they are
  * never assumed.
  * <p/>
@@ -131,7 +131,7 @@ public class Config {
     private static BaseCurrencyNetwork BASE_CURRENCY_NETWORK_VALUE = BaseCurrencyNetwork.XMR_MAINNET;
 
     // Default "data dir properties", i.e. properties that can determine the location of
-    // Bisq's application data directory (appDataDir)
+    // Haveno's application data directory (appDataDir)
     public final String defaultAppName;
     public final File defaultUserDataDir;
     public final File defaultAppDataDir;
@@ -211,7 +211,7 @@ public class Config {
      * {@value APP_NAME} and a newly-created temporary directory as the default
      * {@value USER_DATA_DIR} along with any command line arguments. This constructor is
      * primarily useful in test code, where no references or modifications should be made
-     * to the actual system user data directory and/or real Bisq application data
+     * to the actual system user data directory and/or real Haveno application data
      * directory. Most production use cases will favor calling the
      * {@link #Config(String, File, String...)} constructor directly.
      * @param args zero or more command line arguments in the form "--optName=optValue"
@@ -225,7 +225,7 @@ public class Config {
     /**
      * Create a new {@link Config} instance with the given default {@value APP_NAME} and
      * {@value USER_DATA_DIR} values along with any command line arguments, typically
-     * those supplied via a Bisq application's main() method.
+     * those supplied via a Haveno application's main() method.
      * <p/>
      * This constructor performs all parsing of command line options and config file
      * options, assuming the default config file exists or a custom config file has been
@@ -234,7 +234,7 @@ public class Config {
      * will take precedence. Note that the {@value HELP} and {@value CONFIG_FILE} options
      * are supported only at the command line and are disallowed within the config file
      * itself.
-     * @param defaultAppName typically "Bisq" or similar
+     * @param defaultAppName typically "Haveno" or similar
      * @param defaultUserDataDir typically the OS-specific user data directory location
      * @param args zero or more command line arguments in the form "--optName=optValue"
      * @throws ConfigException if any problems are encountered during option parsing
@@ -307,14 +307,14 @@ public class Config {
                         .describedAs("host:port[,...]");
 
         ArgumentAcceptingOptionSpec<String> bannedPriceRelayNodesOpt =
-                parser.accepts(BANNED_PRICE_RELAY_NODES, "List Bisq price nodes to ban")
+                parser.accepts(BANNED_PRICE_RELAY_NODES, "List Haveno price nodes to ban")
                         .withRequiredArg()
                         .ofType(String.class)
                         .withValuesSeparatedBy(',')
                         .describedAs("host:port[,...]");
 
         ArgumentAcceptingOptionSpec<String> bannedSeedNodesOpt =
-                parser.accepts(BANNED_SEED_NODES, "List Bisq seed nodes to ban")
+                parser.accepts(BANNED_SEED_NODES, "List Haveno seed nodes to ban")
                         .withRequiredArg()
                         .ofType(String.class)
                         .withValuesSeparatedBy(',')
@@ -377,7 +377,7 @@ public class Config {
 
         ArgumentAcceptingOptionSpec<Boolean> ignoreDevMsgOpt =
                 parser.accepts(IGNORE_DEV_MSG, "If set to true all signed " +
-                        "network_messages from bisq developers are ignored (Global " +
+                        "network_messages from haveno developers are ignored (Global " +
                         "alert, Version update alert, Filters for offers, nodes or " +
                         "trading account data)")
                         .withRequiredArg()
@@ -431,14 +431,14 @@ public class Config {
 
         ArgumentAcceptingOptionSpec<Path> torrcFileOpt =
                 parser.accepts(TORRC_FILE, "An existing torrc-file to be sourced for Tor. Note that torrc-entries, " +
-                        "which are critical to Bisq's correct operation, cannot be overwritten.")
+                        "which are critical to Haveno's correct operation, cannot be overwritten.")
                         .withRequiredArg()
                         .describedAs("File")
                         .withValuesConvertedBy(new PathConverter(PathProperties.FILE_EXISTING, PathProperties.READABLE));
 
         ArgumentAcceptingOptionSpec<String> torrcOptionsOpt =
-                parser.accepts(TORRC_OPTIONS, "A list of torrc-entries to amend to Bisq's torrc. Note that " +
-                        "torrc-entries, which are critical to Bisq's flawless operation, cannot be overwritten. " +
+                parser.accepts(TORRC_OPTIONS, "A list of torrc-entries to amend to Haveno's torrc. Note that " +
+                        "torrc-entries, which are critical to Haveno's flawless operation, cannot be overwritten. " +
                         "[torrc options line, torrc option, ...]")
                         .withRequiredArg()
                         .withValuesConvertedBy(RegexMatcher.regex("^([^\\s,]+\\s[^,]+,?\\s*)+$"))
@@ -446,7 +446,7 @@ public class Config {
 
         ArgumentAcceptingOptionSpec<Integer> torControlPortOpt =
                 parser.accepts(TOR_CONTROL_PORT,
-                        "The control port of an already running Tor service to be used by Bisq.")
+                        "The control port of an already running Tor service to be used by Haveno.")
                         .availableUnless(TORRC_FILE, TORRC_OPTIONS)
                         .withRequiredArg()
                         .ofType(int.class)
@@ -547,7 +547,7 @@ public class Config {
                 parser.accepts(USER_AGENT,
                         "User agent at btc node connections")
                         .withRequiredArg()
-                        .defaultsTo("Bisq");
+                        .defaultsTo("Haveno");
 
         ArgumentAcceptingOptionSpec<Integer> numConnectionsForBtcOpt =
                 parser.accepts(NUM_CONNECTIONS_FOR_BTC, "Number of connections to the Bitcoin network")
@@ -763,7 +763,7 @@ public class Config {
 
     private static String randomAppName() {
         try {
-            File file = Files.createTempFile("Bisq", "Temp").toFile();
+            File file = Files.createTempFile("Haveno", "Temp").toFile();
             //noinspection ResultOfMethodCallIgnored
             file.delete();
             return file.toPath().getFileName().toString();
@@ -774,7 +774,7 @@ public class Config {
 
     private static File tempUserDataDir() {
         try {
-            return Files.createTempDirectory("BisqTempUserData").toFile();
+            return Files.createTempDirectory("HavenoTempUserData").toFile();
         } catch (IOException ex) {
             throw new UncheckedIOException(ex);
         }

common/src/main/java/haveno/common/config/ConfigException.java

@@ -1,6 +1,6 @@
-package bisq.common.config;
+package haveno.common.config;
 
-import bisq.common.HavenoException;
+import haveno.common.HavenoException;
 
 public class ConfigException extends HavenoException {
 

common/src/main/java/haveno/common/config/ConfigFileEditor.java

@@ -1,4 +1,4 @@
-package bisq.common.config;
+package haveno.common.config;
 
 import java.io.File;
 import java.io.FileNotFoundException;

common/src/main/java/haveno/common/config/ConfigFileOption.java

@@ -1,4 +1,4 @@
-package bisq.common.config;
+package haveno.common.config;
 
 class ConfigFileOption {
 

common/src/main/java/haveno/common/config/ConfigFileReader.java

@@ -1,4 +1,4 @@
-package bisq.common.config;
+package haveno.common.config;
 
 import java.nio.file.Files;
 

common/src/main/java/haveno/common/config/EnumValueConverter.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.config;
+package haveno.common.config;
 
 import joptsimple.ValueConverter;
 

common/src/main/java/haveno/common/config/HavenoHelpFormatter.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.config;
+package haveno.common.config;
 
 import joptsimple.HelpFormatter;
 import joptsimple.OptionDescriptor;

common/src/main/java/haveno/common/consensus/UsedForTradeContractJson.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.consensus;
+package haveno.common.consensus;
 
 /**
  * Marker interface for classes which are used in the trade contract.

common/src/main/java/haveno/common/crypto/CryptoException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
+package haveno.common.crypto;
 
 public class CryptoException extends Exception {
     public CryptoException(String message) {

common/src/main/java/haveno/common/crypto/CryptoUtils.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
+package haveno.common.crypto;
 
 import java.security.PublicKey;
 import java.security.SecureRandom;

common/src/main/java/haveno/common/crypto/Encryption.java

@@ -15,10 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
-
-import bisq.common.util.Hex;
-import bisq.common.util.Utilities;
+package haveno.common.crypto;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -39,7 +36,8 @@ import java.security.PublicKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.MGF1ParameterSpec;
 import java.security.spec.X509EncodedKeySpec;
-
+import haveno.common.util.Hex;
+import haveno.common.util.Utilities;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 

common/src/main/java/haveno/common/crypto/Hash.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
+package haveno.common.crypto;
 
 import org.bitcoinj.core.Utils;
 

common/src/main/java/haveno/common/crypto/IncorrectPasswordException.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
-package bisq.common.crypto;
+package haveno.common.crypto;
 
 public class IncorrectPasswordException extends Exception {
     public IncorrectPasswordException(String message) {

common/src/main/java/haveno/common/crypto/KeyConversionException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
+package haveno.common.crypto;
 
 public class KeyConversionException extends RuntimeException {
     public KeyConversionException(Throwable cause) {

common/src/main/java/haveno/common/crypto/KeyRing.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
+package haveno.common.crypto;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

common/src/main/java/haveno/common/crypto/KeyStorage.java

@@ -15,12 +15,13 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
+package haveno.common.crypto;
+
+import static haveno.common.util.Preconditions.checkDir;
 
-import bisq.common.config.Config;
-import bisq.common.file.FileUtil;
 import com.google.inject.Inject;
-
+import haveno.common.config.Config;
+import haveno.common.file.FileUtil;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
@@ -55,8 +56,6 @@ import org.slf4j.LoggerFactory;
 
 import org.jetbrains.annotations.NotNull;
 
-import static bisq.common.util.Preconditions.checkDir;
-
 /**
  * KeyStorage uses password protection to save a symmetric key in PKCS#12 format.
  * The symmetric key is used to encrypt and decrypt other keys in the key ring and other types of persistence.

common/src/main/java/haveno/common/crypto/PubKeyRing.java

@@ -15,14 +15,12 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
-
-import bisq.common.consensus.UsedForTradeContractJson;
-import bisq.common.proto.network.NetworkPayload;
-import bisq.common.util.Utilities;
+package haveno.common.crypto;
 
 import com.google.protobuf.ByteString;
-
+import haveno.common.consensus.UsedForTradeContractJson;
+import haveno.common.proto.network.NetworkPayload;
+import haveno.common.util.Utilities;
 import com.google.common.annotations.VisibleForTesting;
 
 import java.security.PublicKey;

common/src/main/java/haveno/common/crypto/PubKeyRingProvider.java

@@ -1,4 +1,4 @@
-package bisq.common.crypto;
+package haveno.common.crypto;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

common/src/main/java/haveno/common/crypto/ScryptUtil.java

@@ -15,13 +15,11 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
-
-import bisq.common.UserThread;
-import bisq.common.util.Utilities;
+package haveno.common.crypto;
 
 import com.google.protobuf.ByteString;
-
+import haveno.common.UserThread;
+import haveno.common.util.Utilities;
 import org.bitcoinj.crypto.KeyCrypterScrypt;
 import org.bitcoinj.wallet.Protos;
 

common/src/main/java/haveno/common/crypto/SealedAndSigned.java

@@ -15,12 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
-
-import bisq.common.proto.network.NetworkPayload;
+package haveno.common.crypto;
 
 import com.google.protobuf.ByteString;
-
+import haveno.common.proto.network.NetworkPayload;
 import java.security.PublicKey;
 
 import lombok.Value;

common/src/main/java/haveno/common/crypto/Sig.java

@@ -15,13 +15,11 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.crypto;
-
-import bisq.common.util.Base64;
-import bisq.common.util.Utilities;
+package haveno.common.crypto;
 
 import com.google.common.base.Charsets;
-
+import haveno.common.util.Base64;
+import haveno.common.util.Utilities;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
 import java.security.KeyPair;

common/src/main/java/haveno/common/file/CorruptedStorageFileHandler.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.file;
+package haveno.common.file;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

common/src/main/java/haveno/common/file/FileUtil.java

@@ -15,12 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.file;
-
-import bisq.common.util.Utilities;
+package haveno.common.file;
 
 import com.google.common.io.Files;
-
+import haveno.common.util.Utilities;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 

common/src/main/java/haveno/common/file/JsonFileManager.java

@@ -15,12 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.file;
-
-import bisq.common.util.Utilities;
+package haveno.common.file;
 
 import java.nio.file.Paths;
-
+import haveno.common.util.Utilities;
 import java.io.File;
 import java.io.PrintWriter;
 

common/src/main/java/haveno/common/file/ResourceNotFoundException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.file;
+package haveno.common.file;
 
 public class ResourceNotFoundException extends Exception {
     public ResourceNotFoundException(String path) {

common/src/main/java/haveno/common/handlers/ErrorMessageHandler.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.handlers;
+package haveno.common.handlers;
 
 /**
  * For reporting error message only (UI)

common/src/main/java/haveno/common/handlers/ExceptionHandler.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.handlers;
+package haveno.common.handlers;
 
 /**
  * For reporting throwable objects only

common/src/main/java/haveno/common/handlers/FaultHandler.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.handlers;
+package haveno.common.handlers;
 
 /**
  * For reporting a description message and throwable

common/src/main/java/haveno/common/handlers/ResultHandler.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.handlers;
+package haveno.common.handlers;
 
 public interface ResultHandler {
     void handleResult();

common/src/main/java/haveno/common/persistence/PersistenceManager.java

@@ -15,25 +15,23 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.persistence;
-
-import bisq.common.Timer;
-import bisq.common.UserThread;
-import bisq.common.app.DevEnv;
-import bisq.common.config.Config;
-import bisq.common.crypto.CryptoException;
-import bisq.common.crypto.Encryption;
-import bisq.common.crypto.KeyRing;
-import bisq.common.file.CorruptedStorageFileHandler;
-import bisq.common.file.FileUtil;
-import bisq.common.handlers.ResultHandler;
-import bisq.common.proto.persistable.PersistableEnvelope;
-import bisq.common.proto.persistable.PersistenceProtoResolver;
-import bisq.common.util.GcUtil;
-import bisq.common.util.Utilities;
+package haveno.common.persistence;
 
 import com.google.inject.Inject;
-
+import haveno.common.Timer;
+import haveno.common.UserThread;
+import haveno.common.app.DevEnv;
+import haveno.common.config.Config;
+import haveno.common.crypto.CryptoException;
+import haveno.common.crypto.Encryption;
+import haveno.common.crypto.KeyRing;
+import haveno.common.file.CorruptedStorageFileHandler;
+import haveno.common.file.FileUtil;
+import haveno.common.handlers.ResultHandler;
+import haveno.common.proto.persistable.PersistableEnvelope;
+import haveno.common.proto.persistable.PersistenceProtoResolver;
+import haveno.common.util.GcUtil;
+import haveno.common.util.Utilities;
 import javax.inject.Named;
 
 import java.nio.file.Path;
@@ -58,8 +56,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Nullable;
 
-import static bisq.common.util.Preconditions.checkDir;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static haveno.common.util.Preconditions.checkDir;
 
 /**
  * Responsible for reading persisted data and writing it on disk. We read usually only at start-up and keep data in RAM.

common/src/main/java/haveno/common/proto/ProtoResolver.java

@@ -15,10 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto;
+package haveno.common.proto;
 
-import bisq.common.Payload;
-import bisq.common.proto.persistable.PersistablePayload;
+import haveno.common.Payload;
+import haveno.common.proto.persistable.PersistablePayload;
 
 public interface ProtoResolver {
     Payload fromProto(protobuf.PaymentAccountPayload proto);

common/src/main/java/haveno/common/proto/ProtoUtil.java

@@ -15,15 +15,13 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto;
-
-import bisq.common.Proto;
-import bisq.common.util.CollectionUtils;
+package haveno.common.proto;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Message;
 import com.google.protobuf.ProtocolStringList;
-
+import haveno.common.Proto;
+import haveno.common.util.CollectionUtils;
 import com.google.common.base.Enums;
 
 import java.util.ArrayList;

common/src/main/java/haveno/common/proto/ProtobufferException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto;
+package haveno.common.proto;
 
 import java.io.IOException;
 

common/src/main/java/haveno/common/proto/ProtobufferRuntimeException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto;
+package haveno.common.proto;
 
 public class ProtobufferRuntimeException extends RuntimeException {
     public ProtobufferRuntimeException(String message) {

common/src/main/java/haveno/common/proto/network/NetworkEnvelope.java

@@ -15,12 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.network;
-
-import bisq.common.Envelope;
+package haveno.common.proto.network;
 
 import com.google.protobuf.Message;
-
+import haveno.common.Envelope;
 import lombok.EqualsAndHashCode;
 
 import static com.google.common.base.Preconditions.checkArgument;

common/src/main/java/haveno/common/proto/network/NetworkPayload.java

@@ -15,9 +15,9 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.network;
+package haveno.common.proto.network;
 
-import bisq.common.Payload;
+import haveno.common.Payload;
 
 /**
  * Interface for objects used inside WireEnvelope or other WirePayloads.

common/src/main/java/haveno/common/proto/network/NetworkProtoResolver.java

@@ -15,11 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.network;
-
-import bisq.common.proto.ProtoResolver;
-import bisq.common.proto.ProtobufferException;
+package haveno.common.proto.network;
 
+import haveno.common.proto.ProtoResolver;
+import haveno.common.proto.ProtobufferException;
 import java.time.Clock;
 
 

common/src/main/java/haveno/common/proto/persistable/NavigationPath.java

@@ -15,12 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.persistable;
-
-import bisq.common.util.CollectionUtils;
+package haveno.common.proto.persistable;
 
 import com.google.protobuf.Message;
-
+import haveno.common.util.CollectionUtils;
 import java.util.List;
 
 import lombok.AllArgsConstructor;

common/src/main/java/haveno/common/proto/persistable/PersistableEnvelope.java

@@ -15,11 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.persistable;
-
-import bisq.common.Envelope;
+package haveno.common.proto.persistable;
 
 import com.google.protobuf.Message;
+import haveno.common.Envelope;
 
 /**
  * Interface for the outside envelope object persisted to disk.

common/src/main/java/haveno/common/proto/persistable/PersistableList.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.persistable;
+package haveno.common.proto.persistable;
 
 import java.util.ArrayList;
 import java.util.Collection;

common/src/main/java/haveno/common/proto/persistable/PersistableListAsObservable.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.persistable;
+package haveno.common.proto.persistable;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;

common/src/main/java/haveno/common/proto/persistable/PersistablePayload.java

@@ -15,9 +15,9 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.persistable;
+package haveno.common.proto.persistable;
 
-import bisq.common.Payload;
+import haveno.common.Payload;
 
 /**
  * Interface for objects used inside Envelope or other Payloads.

common/src/main/java/haveno/common/proto/persistable/PersistedDataHost.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.persistable;
+package haveno.common.proto.persistable;
 
 public interface PersistedDataHost {
     void readPersisted(Runnable completeHandler);

common/src/main/java/haveno/common/proto/persistable/PersistenceProtoResolver.java

@@ -15,9 +15,9 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.proto.persistable;
+package haveno.common.proto.persistable;
 
-import bisq.common.proto.ProtoResolver;
+import haveno.common.proto.ProtoResolver;
 
 
 public interface PersistenceProtoResolver extends ProtoResolver {

common/src/main/java/haveno/common/reactfx/FxTimer.java

@@ -1,4 +1,4 @@
-package bisq.common.reactfx;
+package haveno.common.reactfx;
 
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;

common/src/main/java/haveno/common/reactfx/Timer.java

@@ -1,4 +1,4 @@
-package bisq.common.reactfx;
+package haveno.common.reactfx;
 
 /**
  * Timer represents a delayed action. This means that every timer has an

common/src/main/java/haveno/common/setup/CommonSetup.java

@@ -15,16 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.setup;
-
-import bisq.common.UserThread;
-import bisq.common.app.AsciiLogo;
-import bisq.common.app.DevEnv;
-import bisq.common.app.Log;
-import bisq.common.app.Version;
-import bisq.common.config.Config;
-import bisq.common.util.Profiler;
-import bisq.common.util.Utilities;
+package haveno.common.setup;
 
 import org.bitcoinj.store.BlockStoreException;
 
@@ -37,7 +28,14 @@ import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 
 import ch.qos.logback.classic.Level;
-
+import haveno.common.UserThread;
+import haveno.common.app.AsciiLogo;
+import haveno.common.app.DevEnv;
+import haveno.common.app.Log;
+import haveno.common.app.Version;
+import haveno.common.config.Config;
+import haveno.common.util.Profiler;
+import haveno.common.util.Utilities;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -91,7 +89,7 @@ public class CommonSetup {
     }
 
     private static void setupLog(Config config) {
-        String logPath = Paths.get(config.appDataDir.getPath(), "bisq").toString();
+        String logPath = Paths.get(config.appDataDir.getPath(), "haveno").toString();
         Log.setup(logPath);
         Utilities.printSysInfo();
         Log.setLevel(Level.toLevel(config.logLevel));
@@ -120,7 +118,7 @@ public class CommonSetup {
         try {
             final String pathOfCodeSource = Utilities.getPathOfCodeSource();
             if (!pathOfCodeSource.endsWith("classes"))
-                log.info("Path to Bisq jar file: " + pathOfCodeSource);
+                log.info("Path to Haveno jar file: " + pathOfCodeSource);
         } catch (URISyntaxException e) {
             log.error(e.toString());
             e.printStackTrace();

common/src/main/java/haveno/common/setup/GracefulShutDownHandler.java

@@ -15,9 +15,9 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.setup;
+package haveno.common.setup;
 
-import bisq.common.handlers.ResultHandler;
+import haveno.common.handlers.ResultHandler;
 
 public interface GracefulShutDownHandler {
     void gracefulShutDown(ResultHandler resultHandler);

common/src/main/java/haveno/common/setup/UncaughtExceptionHandler.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.setup;
+package haveno.common.setup;
 
 public interface UncaughtExceptionHandler {
     void handleUncaughtException(Throwable throwable, boolean doShutDown);

common/src/main/java/haveno/common/taskrunner/InterceptTaskException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.taskrunner;
+package haveno.common.taskrunner;
 
 public class InterceptTaskException extends RuntimeException {
     public InterceptTaskException(String message) {

common/src/main/java/haveno/common/taskrunner/Model.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.taskrunner;
+package haveno.common.taskrunner;
 
 public interface Model {
     void onComplete();

common/src/main/java/haveno/common/taskrunner/Task.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.taskrunner;
+package haveno.common.taskrunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/haveno/common/taskrunner/TaskRunner.java

@@ -15,11 +15,10 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.taskrunner;
-
-import bisq.common.handlers.ErrorMessageHandler;
-import bisq.common.handlers.ResultHandler;
+package haveno.common.taskrunner;
 
+import haveno.common.handlers.ErrorMessageHandler;
+import haveno.common.handlers.ResultHandler;
 import java.util.Arrays;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;

common/src/main/java/haveno/common/util/Base64.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 /**
  * We use Java 8 builtin Base64 because it is much faster than Guava and Apache versions:

common/src/main/java/haveno/common/util/CollectionUtils.java

@@ -1,4 +1,4 @@
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.Collection;
 import java.util.Map;
@@ -6,8 +6,8 @@ import java.util.Map;
 /**
  * Collection utility methods copied from Spring Framework v4.3.6's
  * {@code org.springframework.util.CollectionUtils} class in order to make it possible to
- * drop Bisq's dependency on Spring altogether. The name of the class and methods have
- * been preserved here to minimize the impact to the Bisq codebase of making this change.
+ * drop Haveno's dependency on Spring altogether. The name of the class and methods have
+ * been preserved here to minimize the impact to the Haveno codebase of making this change.
  * All that is necessary to swap this implementation in is to change the CollectionUtils
  * import statement.
  */

common/src/main/java/haveno/common/util/CompletableFutureUtils.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

common/src/main/java/haveno/common/util/DesktopUtil.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.net.URI;
 

common/src/main/java/haveno/common/util/DoubleSummaryStatisticsWithStdDev.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.DoubleSummaryStatistics;
 

common/src/main/java/haveno/common/util/ExtraDataMapValidator.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.HashMap;
 import java.util.Map;

common/src/main/java/haveno/common/util/GcUtil.java

@@ -15,10 +15,9 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
-
-import bisq.common.UserThread;
+package haveno.common.util;
 
+import haveno.common.UserThread;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/haveno/common/util/Hex.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import com.google.common.io.BaseEncoding;
 

common/src/main/java/haveno/common/util/InvalidVersionException.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 public class InvalidVersionException extends Exception {
     public InvalidVersionException(String msg) {

common/src/main/java/haveno/common/util/JsonExclude.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

common/src/main/java/haveno/common/util/MathUtils.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import com.google.common.math.DoubleMath;
 

common/src/main/java/haveno/common/util/PermutationUtil.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.ArrayList;
 import java.util.Collections;

common/src/main/java/haveno/common/util/Preconditions.java

@@ -1,4 +1,4 @@
-package bisq.common.util;
+package haveno.common.util;
 
 import java.io.File;
 

common/src/main/java/haveno/common/util/Profiler.java

@@ -15,10 +15,9 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
-
-import bisq.common.UserThread;
+package haveno.common.util;
 
+import haveno.common.UserThread;
 import java.util.concurrent.TimeUnit;
 
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/haveno/common/util/ReflectionUtils.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 
 import java.util.List;

common/src/main/java/haveno/common/util/RestartUtil.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.io.File;
 import java.io.IOException;

common/src/main/java/haveno/common/util/Tuple2.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.io.Serializable;
 

common/src/main/java/haveno/common/util/Tuple3.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.Objects;
 

common/src/main/java/haveno/common/util/Tuple4.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.Objects;
 

common/src/main/java/haveno/common/util/Tuple5.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import java.util.Objects;
 

common/src/main/java/haveno/common/util/Utilities.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.util;
+package haveno.common.util;
 
 import org.bitcoinj.core.Utils;
 
@@ -203,7 +203,7 @@ public class Utilities {
     }
 
     /**
-     * @return True, if Bisq is running on a virtualized OS within Qubes, false otherwise
+     * @return True, if Haveno is running on a virtualized OS within Qubes, false otherwise
      */
     public static boolean isQubesOS() {
         // For Linux qubes, "os.version" looks like "4.19.132-1.pvops.qubes.x86_64"

common/src/main/java/haveno/common/util/ZipUtils.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
-package bisq.common.util;
+package haveno.common.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -111,8 +111,8 @@ public class ZipUtils {
 
                     log.info("Unzipped file: " + file.getAbsolutePath());
                     // Don't overwrite the current logs
-                    if ("bisq.log".equals(file.getName())) {
-                        file = new File(file.getParent() + "/" + "bisq.backup.log");
+                    if ("haveno.log".equals(file.getName())) {
+                        file = new File(file.getParent() + "/" + "haveno.backup.log");
                         log.info("Unzipped logfile to backup path: " + file.getAbsolutePath());
                     }
 

common/src/test/java/haveno/common/app/CapabilitiesTest.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -23,13 +23,16 @@ import java.util.HashSet;
 
 import org.junit.Test;
 
-import static bisq.common.app.Capability.SEED_NODE;
-import static bisq.common.app.Capability.TRADE_STATISTICS;
-import static bisq.common.app.Capability.TRADE_STATISTICS_2;
+import static haveno.common.app.Capability.SEED_NODE;
+import static haveno.common.app.Capability.TRADE_STATISTICS;
+import static haveno.common.app.Capability.TRADE_STATISTICS_2;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import haveno.common.app.Capabilities;
+import haveno.common.app.Capability;
+
 public class CapabilitiesTest {
 
     @Test

common/src/test/java/haveno/common/app/VersionTest.java

@@ -15,7 +15,7 @@
  * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.app;
+package haveno.common.app;
 
 import org.junit.Test;
 
@@ -23,6 +23,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import haveno.common.app.Version;
+
 public class VersionTest {
 
     @Test

common/src/test/java/haveno/common/config/ConfigFileEditorTests.java

@@ -1,4 +1,4 @@
-package bisq.common.config;
+package haveno.common.config;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,6 +12,9 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import haveno.common.config.ConfigFileEditor;
+import haveno.common.config.ConfigFileReader;
+
 public class ConfigFileEditorTests {
 
     private File file;
@@ -21,7 +24,7 @@ public class ConfigFileEditorTests {
 
     @Before
     public void setUp() throws IOException {
-        file = File.createTempFile("bisq", "properties");
+        file = File.createTempFile("haveno", "properties");
         reader = new ConfigFileReader(file);
         editor = new ConfigFileEditor(file);
         writer = new PrintWriter(file);

common/src/test/java/haveno/common/config/ConfigFileOptionTests.java

@@ -1,10 +1,12 @@
-package bisq.common.config;
+package haveno.common.config;
 
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import haveno.common.config.ConfigFileOption;
+
 public class ConfigFileOptionTests {
 
     @Test