diff --git a/lib/Slic3r/GUI/BonjourBrowser.pm b/lib/Slic3r/GUI/BonjourBrowser.pm
index bb2282e59..281277768 100644
--- a/lib/Slic3r/GUI/BonjourBrowser.pm
+++ b/lib/Slic3r/GUI/BonjourBrowser.pm
@@ -19,7 +19,7 @@ sub new {
     $self->{devices} = [ $res->entries ];
     
     # label
-    my $text = Wx::StaticText->new($self, -1, "Choose an Octoprint device in your network:", wxDefaultPosition, wxDefaultSize);
+    my $text = Wx::StaticText->new($self, -1, "Choose an OctoPrint device in your network:", wxDefaultPosition, wxDefaultSize);
     
     # selector
     $self->{choice} = my $choice = Wx::Choice->new($self, -1, wxDefaultPosition, wxDefaultSize,
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index fe754a044..f14da581d 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -1086,7 +1086,7 @@ sub on_export_completed {
     my $send_gcode = 0;
     if ($result) {
         if ($self->{send_gcode_file}) {
-            $message = "Sending G-code file to the Octoprint server...";
+            $message = "Sending G-code file to the OctoPrint server...";
             $send_gcode = 1;
         } else {
             $message = "G-code file exported to " . $self->{export_gcode_output_file};
@@ -1122,9 +1122,9 @@ sub send_gcode {
     $self->statusbar->StopBusy;
     
     if ($res->is_success) {
-        $self->statusbar->SetStatusText("G-code file successfully uploaded to the Octoprint server");
+        $self->statusbar->SetStatusText("G-code file successfully uploaded to the OctoPrint server");
     } else {
-        my $message = "Error while uploading to the Octoprint server: " . $res->status_line;
+        my $message = "Error while uploading to the OctoPrint server: " . $res->status_line;
         Slic3r::GUI::show_error($self, $message);
         $self->statusbar->SetStatusText($message);
     }
diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm
index af7aae4fe..6aac1c862 100644
--- a/lib/Slic3r/GUI/Tab.pm
+++ b/lib/Slic3r/GUI/Tab.pm
@@ -998,7 +998,7 @@ sub build {
             });
         }
         {
-            my $optgroup = $page->new_optgroup('Octoprint upload');
+            my $optgroup = $page->new_optgroup('OctoPrint upload');
             
             # append a button to the Host line
             my $octoprint_host_widget = sub {
diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp
index 805667a8a..2ca83c15e 100644
--- a/xs/src/libslic3r/PrintConfig.cpp
+++ b/xs/src/libslic3r/PrintConfig.cpp
@@ -500,12 +500,12 @@ PrintConfigDef::build_def() {
 
     Options["octoprint_apikey"].type = coString;
     Options["octoprint_apikey"].label = "API Key";
-    Options["octoprint_apikey"].tooltip = "Slic3r can upload G-code files to Octoprint. This field should contain the API Key required for authentication.";
+    Options["octoprint_apikey"].tooltip = "Slic3r can upload G-code files to OctoPrint. This field should contain the API Key required for authentication.";
     Options["octoprint_apikey"].cli = "octoprint-apikey=s";
 
     Options["octoprint_host"].type = coString;
     Options["octoprint_host"].label = "Host or IP";
-    Options["octoprint_host"].tooltip = "Slic3r can upload G-code files to Octoprint. This field should contain the hostname or IP address of the Octoprint instance.";
+    Options["octoprint_host"].tooltip = "Slic3r can upload G-code files to OctoPrint. This field should contain the hostname or IP address of the OctoPrint instance.";
     Options["octoprint_host"].cli = "octoprint-host=s";
 
     Options["only_retract_when_crossing_perimeters"].type = coBool;