diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp
index e5a11e4d0..fef1f6e7f 100644
--- a/src/PrusaSlicer.cpp
+++ b/src/PrusaSlicer.cpp
@@ -575,7 +575,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
         << " (without GUI support)"
 #endif /* SLIC3R_GUI */
         << std::endl
-        << "https://github.com/prusa3d/Slic3r" << std::endl << std::endl
+        << "https://github.com/prusa3d/PrusaSlicer" << std::endl << std::endl
         << "Usage: slic3r [ ACTIONS ] [ TRANSFORM ] [ OPTIONS ] [ file.stl ... ]" << std::endl
         << std::endl
         << "Actions:" << std::endl;
diff --git a/src/admesh/normals.cpp b/src/admesh/normals.cpp
index 0ad134360..ecf08b59c 100644
--- a/src/admesh/normals.cpp
+++ b/src/admesh/normals.cpp
@@ -108,7 +108,7 @@ stl_fix_normal_directions(stl_file *stl) {
 
   if (stl->error) return;
 
-  // this may happen for malformed models, see: https://github.com/prusa3d/Slic3r/issues/2209
+  // this may happen for malformed models, see: https://github.com/prusa3d/PrusaSlicer/issues/2209
   if (stl->stats.number_of_facets == 0) return;
 
   /* Initialize linked list. */
diff --git a/src/avrdude/ac_cfg.h b/src/avrdude/ac_cfg.h
index 41d648bf1..a4e6a2cb5 100644
--- a/src/avrdude/ac_cfg.h
+++ b/src/avrdude/ac_cfg.h
@@ -172,7 +172,7 @@
 #define PACKAGE "avrdude-slic3r"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://github.com/prusa3d/Slic3r/issues"
+#define PACKAGE_BUGREPORT "https://github.com/prusa3d/PrusaSlicer/issues"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "avrdude-slic3r"
@@ -184,7 +184,7 @@
 #define PACKAGE_TARNAME "avrdude-slic3r"
 
 /* Define to the home page for this package. */
-#define PACKAGE_URL "https://github.com/prusa3d/Slic3r"
+#define PACKAGE_URL "https://github.com/prusa3d/PrusaSlicer"
 
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "6.3-20160220"
diff --git a/src/libslic3r/ModelArrange.cpp b/src/libslic3r/ModelArrange.cpp
index 18a2d08c4..b088a1f17 100644
--- a/src/libslic3r/ModelArrange.cpp
+++ b/src/libslic3r/ModelArrange.cpp
@@ -568,7 +568,7 @@ ShapeData2D projectModelFromTop(const Slic3r::Model &model, const WipeTowerInfo&
                 Polygon p = objptr->convex_hull_2d(trafo_instance);
 				assert(! p.points.empty());
 
-                // this may happen for malformed models, see: https://github.com/prusa3d/Slic3r/issues/2209
+                // this may happen for malformed models, see: https://github.com/prusa3d/PrusaSlicer/issues/2209
                 if (p.points.empty())
                     continue;
 
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 84837389e..2905507c4 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -1737,7 +1737,7 @@ void Print::_make_wipe_tower()
     // Check whether there are any layers in m_tool_ordering, which are marked with has_wipe_tower,
     // they print neither object, nor support. These layers are above the raft and below the object, and they
     // shall be added to the support layers to be printed.
-    // see https://github.com/prusa3d/Slic3r/issues/607
+    // see https://github.com/prusa3d/PrusaSlicer/issues/607
     {
         size_t idx_begin = size_t(-1);
         size_t idx_end   = m_wipe_tower_data.tool_ordering.layer_tools().size();
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index fddb71193..bcc61e0bf 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -2259,7 +2259,7 @@ void PrintObject::discover_horizontal_shells()
                     // when spacing is added in Fill.pm
                     {
                         //FIXME Vojtech: Disable this and you will be sorry.
-                        // https://github.com/prusa3d/Slic3r/issues/26 bottom
+                        // https://github.com/prusa3d/PrusaSlicer/issues/26 bottom
                         float margin = 3.f * layerm->flow(frSolidInfill).scaled_width(); // require at least this size
                         // we use a higher miterLimit here to handle areas with acute angles
                         // in those cases, the default miterLimit would cut the corner and we'd
diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
index 21ec3d307..e76fccdb8 100644
--- a/src/libslic3r/Utils.hpp
+++ b/src/libslic3r/Utils.hpp
@@ -64,7 +64,7 @@ extern int rename_file(const std::string &from, const std::string &to);
 extern int copy_file(const std::string &from, const std::string &to);
 
 // Ignore system and hidden files, which may be created by the DropBox synchronisation process.
-// https://github.com/prusa3d/Slic3r/issues/1298
+// https://github.com/prusa3d/PrusaSlicer/issues/1298
 extern bool is_plain_file(const boost::filesystem::directory_entry &path);
 extern bool is_ini_file(const boost::filesystem::directory_entry &path);
 extern bool is_idx_file(const boost::filesystem::directory_entry &path);
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
index 4fc032471..3482f708a 100644
--- a/src/libslic3r/utils.cpp
+++ b/src/libslic3r/utils.cpp
@@ -247,7 +247,7 @@ int copy_file(const std::string &from, const std::string &to)
 }
 
 // Ignore system and hidden files, which may be created by the DropBox synchronisation process.
-// https://github.com/prusa3d/Slic3r/issues/1298
+// https://github.com/prusa3d/PrusaSlicer/issues/1298
 bool is_plain_file(const boost::filesystem::directory_entry &dir_entry)
 {
     if (! boost::filesystem::is_regular_file(dir_entry.status()))
diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt
index e25da35e3..a3e7da126 100644
--- a/src/qhull/CMakeLists.txt
+++ b/src/qhull/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # This CMake file is written specifically to integrate qhull library with Slic3rPE
-# (see https://github.com/prusa3d/Slic3r for more information about the project)
+# (see https://github.com/prusa3d/PrusaSlicer for more information about the project)
 #
 # Only original libraries qhullstatic_r and qhullcpp are included.
 # They are built as a single statically linked library.
diff --git a/src/qhull/README.txt b/src/qhull/README.txt
index f4c7a3b22..c811b9f80 100644
--- a/src/qhull/README.txt
+++ b/src/qhull/README.txt
@@ -1,5 +1,5 @@
 This distribution of qhull library is only meant for interfacing qhull with Slic3rPE
-(https://github.com/prusa3d/Slic3r).
+(https://github.com/prusa3d/PrusaSlicer).
 
 The qhull source file was acquired from https://github.com/qhull/qhull at revision
 f0bd8ceeb84b554d7cdde9bbfae7d3351270478c.
diff --git a/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp
index 9fe8bfe47..ac7c8d46e 100644
--- a/src/slic3r/GUI/AppConfig.cpp
+++ b/src/slic3r/GUI/AppConfig.cpp
@@ -55,7 +55,7 @@ void AppConfig::set_defaults()
         set("preset_update", "1");
 
     // Use OpenGL 1.1 even if OpenGL 2.0 is available. This is mainly to support some buggy Intel HD Graphics drivers.
-    // https://github.com/prusa3d/Slic3r/issues/233
+    // github.com/prusa3d/PrusaSlicer/issues/233
     if (get("use_legacy_opengl").empty())
         set("use_legacy_opengl", "0");
 
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 7633c2319..bb2cb5e2d 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -5324,7 +5324,7 @@ bool GLCanvas3D::_travel_paths_by_tool(const GCodePreviewData& preview_data, con
     // creates a new volume for each tool
     for (Tool& tool : tools)
     {
-        // tool.value could be invalid (as it was with https://github.com/prusa3d/Slic3r/issues/2179), we better check
+        // tool.value could be invalid (as it was with https://github.com/prusa3d/PrusaSlicer/issues/2179), we better check
         if (tool.value >= tool_colors.size())
             continue;
 
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 1eb228988..04851ac3d 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -2826,7 +2826,7 @@ void Tab::OnTreeSelChange(wxTreeEvent& event)
 	if (m_disable_tree_sel_changed_event)         
         return;
 
-// There is a bug related to Ubuntu overlay scrollbars, see https://github.com/prusa3d/Slic3r/issues/898 and https://github.com/prusa3d/Slic3r/issues/952.
+// There is a bug related to Ubuntu overlay scrollbars, see https://github.com/prusa3d/PrusaSlicer/issues/898 and https://github.com/prusa3d/PrusaSlicer/issues/952.
 // The issue apparently manifests when Show()ing a window with overlay scrollbars while the UI is frozen. For this reason,
 // we will Thaw the UI prematurely on Linux. This means destroing the no_updates object prematurely.
 #ifdef __linux__	
diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp
index b02d84947..c378b853e 100644
--- a/src/slic3r/GUI/UpdateDialogs.cpp
+++ b/src/slic3r/GUI/UpdateDialogs.cpp
@@ -224,7 +224,7 @@ MsgDataLegacy::MsgDataLegacy() :
 	content_sizer->AddSpacer(VERT_SPACING);
 
 	auto *text2 = new wxStaticText(this, wxID_ANY, _(L("For more information please visit our wiki page:")));
-	static const wxString url("https://github.com/prusa3d/Slic3r/wiki/Slic3r-PE-1.40-configuration-update");
+	static const wxString url("https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-PE-1.40-configuration-update");
 	// The wiki page name is intentionally not localized:
 	auto *link = new wxHyperlinkCtrl(this, wxID_ANY, wxString::Format("%s 1.40 configuration update", SLIC3R_APP_NAME), CONFIG_UPDATE_WIKI_URL);
 	content_sizer->Add(text2);