diff --git a/examples/plugin/gz_components/GzComponents.qml b/examples/plugin/gz_components/GzComponents.qml
index d1d921be9..7a7fd7997 100644
--- a/examples/plugin/gz_components/GzComponents.qml
+++ b/examples/plugin/gz_components/GzComponents.qml
@@ -40,13 +40,4 @@ Column {
     value: 5.8
     width: 300
   }
-
-  // Deprecated spin box
-  IgnSpinBox {
-    minimumValue: -2
-    maximumValue: 19
-    decimals: 0
-    stepSize: 3
-    value: 5
-  }
 }
diff --git a/include/gz/gui/qml/qmldir b/include/gz/gui/qml/qmldir
index 023113ebd..04de27323 100644
--- a/include/gz/gui/qml/qmldir
+++ b/include/gz/gui/qml/qmldir
@@ -5,7 +5,3 @@ GzPose 1.0 GzPose.qml
 GzSnackBar 1.0 GzSnackBar.qml
 GzSpinBox 1.0 GzSpinBox.qml
 GzVector3 1.0 GzVector3.qml
-
-# Deprecated components, remove on tock
-IgnSnackBar 1.0 GzSnackBar.qml
-IgnSpinBox 1.0 GzSpinBox.qml
diff --git a/src/Application.cc b/src/Application.cc
index 8e197bef2..4c0f51d99 100644
--- a/src/Application.cc
+++ b/src/Application.cc
@@ -58,10 +58,6 @@ namespace gz
       /// these until it is ok to unload the plugin's shared library.
       public: std::vector<std::shared_ptr<Plugin>> pluginsAdded;
 
-      /// \brief Deprecated environment variable which holds paths to look for
-      /// plugins
-      public: std::string pluginPathEnvDeprecated = "IGN_GUI_PLUGIN_PATH";
-
       /// \brief Environment variable which holds paths to look for plugins
       public: std::string pluginPathEnv = "GZ_GUI_PLUGIN_PATH";
 
diff --git a/src/Plugin.cc b/src/Plugin.cc
index 961ce4af4..e2c05684a 100644
--- a/src/Plugin.cc
+++ b/src/Plugin.cc
@@ -72,7 +72,7 @@ class gz::gui::PluginPrivate
   public: QQmlContext *context{nullptr};
 
   /// \brief Map of card properties to be passed to QML card object.
-  /// Accepts all QML Pane properties plus custom Igntiion GUI properties.
+  /// Accepts all QML Pane properties plus custom Gazeb: GUI properties.
   /// https://doc.qt.io/qt-5/qml-qtquick-controls2-pane-members.html
   public: std::map<std::string, QVariant> cardProperties;
 
diff --git a/src/plugins/marker_manager/MarkerManager.cc b/src/plugins/marker_manager/MarkerManager.cc
index 379efa725..d460683d3 100644
--- a/src/plugins/marker_manager/MarkerManager.cc
+++ b/src/plugins/marker_manager/MarkerManager.cc
@@ -353,7 +353,7 @@ bool MarkerManagerPrivate::ProcessMarkerMsg(const gz::msgs::Marker &_msg)
     else
     {
       // Create the name for the marker
-      std::string name = "__IGN_MARKER_VISUAL_" + ns + "_" +
+      std::string name = "__GZ_MARKER_VISUAL_" + ns + "_" +
                          std::to_string(id);
 
       // Create the new marker