diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index 0c6c81bb5..72164859e 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -28,7 +28,7 @@ BEGIN {
     use Config;
     use Moo;
     my $have_threads = $Config{useithreads} && eval "use threads; use threads::shared; use Thread::Queue; 1";
-    die "Slic3r Prusa Edition requires working Perl threads.\n" if ! $have_threads;
+    die "Slic3r++ requires working Perl threads.\n" if ! $have_threads;
     die "threads.pm >= 1.96 is required, please update\n" if $threads::VERSION < 1.96;
     die "Perl threading is broken with this Moo version: " . $Moo::VERSION . "\n" if $Moo::VERSION == 1.003000;
     $debug = 1 if (defined($ENV{'SLIC3R_DEBUGOUT'}) && $ENV{'SLIC3R_DEBUGOUT'} == 1);
diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
index 80130fefe..a9c0fd523 100644
--- a/lib/Slic3r/GUI.pm
+++ b/lib/Slic3r/GUI.pm
@@ -74,7 +74,7 @@ sub OnInit {
     my ($self) = @_;
     
     $self->SetAppName('Slic3rPE');
-    $self->SetAppDisplayName('Slic3r Prusa Edition');
+    $self->SetAppDisplayName('Slic3r++');
     Slic3r::debugf "wxWidgets version %s, Wx version %s\n", &Wx::wxVERSION_STRING, $Wx::VERSION;
 
     # Set the Slic3r data directory at the Slic3r XS module.
diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
index 910b86dd8..7acdcc3a4 100644
--- a/lib/Slic3r/GUI/MainFrame.pm
+++ b/lib/Slic3r/GUI/MainFrame.pm
@@ -339,8 +339,8 @@ sub _init_menubar {
         $self->_append_menu_item($helpMenu, L("Show &Configuration Folder"), L('Show user configuration folder (datadir)'), sub {
             Slic3r::GUI::desktop_open_datadir_folder();
         });
-        $self->_append_menu_item($helpMenu, L("Report an Issue"), L('Report an issue on the Slic3r Prusa Edition'), sub {
-            Wx::LaunchDefaultBrowser('http://github.com/prusa3d/slic3r/issues/new');
+        $self->_append_menu_item($helpMenu, L("Report an Issue"), L('Report an issue on the Slic3r++ github'), sub {
+            Wx::LaunchDefaultBrowser('http://github.com/supermerill/slic3r/issues/new');
         });
         $self->_append_menu_item($helpMenu, L("&About Slic3r"), L('Show about dialog'), sub {
             Slic3r::GUI::about;
diff --git a/lib/Slic3r/GUI/SystemInfo.pm b/lib/Slic3r/GUI/SystemInfo.pm
index 717ff12e5..e26248e2d 100644
--- a/lib/Slic3r/GUI/SystemInfo.pm
+++ b/lib/Slic3r/GUI/SystemInfo.pm
@@ -10,7 +10,7 @@ use base 'Wx::Dialog';
 
 sub new {
     my ($class, %params) = @_;
-    my $self = $class->SUPER::new($params{parent}, -1, 'Slic3r Prusa Edition - System Information', wxDefaultPosition, [600, 340], 
+    my $self = $class->SUPER::new($params{parent}, -1, 'Slic3r++ - System Information', wxDefaultPosition, [600, 340], 
         wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxRESIZE_BORDER);
     $self->{text_info} = $params{text_info};
 
diff --git a/xs/src/libslic3r/libslic3r.h b/xs/src/libslic3r/libslic3r.h
index fd6b56e3a..b15f9ae03 100644
--- a/xs/src/libslic3r/libslic3r.h
+++ b/xs/src/libslic3r/libslic3r.h
@@ -13,7 +13,7 @@
 #include <vector>
 #include <boost/thread.hpp>
 
-#define SLIC3R_FORK_NAME "Slic3r Prusa Edition"
+#define SLIC3R_FORK_NAME "Slic3r++"
 #define SLIC3R_VERSION "1.40.0"
 #define SLIC3R_BUILD "UNKNOWN"
 
diff --git a/xs/src/slic3r/GUI/AboutDialog.cpp b/xs/src/slic3r/GUI/AboutDialog.cpp
index 0fed8d175..e6e061990 100644
--- a/xs/src/slic3r/GUI/AboutDialog.cpp
+++ b/xs/src/slic3r/GUI/AboutDialog.cpp
@@ -53,7 +53,7 @@ AboutDialog::AboutDialog()
 
     // title
     {
-        wxStaticText* title = new wxStaticText(this, wxID_ANY, "Slic3r Prusa Edition", wxDefaultPosition, wxDefaultSize);
+        wxStaticText* title = new wxStaticText(this, wxID_ANY, "Slic3r++", wxDefaultPosition, wxDefaultSize);
         wxFont title_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
         title_font.SetWeight(wxFONTWEIGHT_BOLD);
         title_font.SetFamily(wxFONTFAMILY_ROMAN);
diff --git a/xs/src/slic3r/GUI/ConfigWizard.cpp b/xs/src/slic3r/GUI/ConfigWizard.cpp
index 556a1c334..22ea4d784 100644
--- a/xs/src/slic3r/GUI/ConfigWizard.cpp
+++ b/xs/src/slic3r/GUI/ConfigWizard.cpp
@@ -218,7 +218,7 @@ PageWelcome::PageWelcome(ConfigWizard *parent) :
 	if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) {
 		wxString::Format(_(L("Run %s")), ConfigWizard::name());
 		append_text(wxString::Format(
-			_(L("Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
+			_(L("Hello, welcome to Slic3r++ (fork of Slic3r Prusa Edition)! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
 			ConfigWizard::name())
 		);
 	} else {