diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java
index 5b4cd7e91e1..cbd58352a6a 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2013 IBM Corporation and others.
+ * Copyright (c) 2006, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -18,17 +18,17 @@
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.DefaultLabelProvider;
 import org.eclipse.debug.internal.ui.actions.variables.details.DetailPaneAssignValueAction;
+import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.viewers.ICellModifier;
 
 /**
  * @since 3.2
  */
-@SuppressWarnings("deprecation")
 public class DefaultVariableCellModifier implements ICellModifier {
 
 	@Override
 	public boolean canModify(Object element, String property) {
-		if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(property)) {
+		if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE.equals(property)) {
 			if (element instanceof IVariable) {
 				return ((IVariable) element).supportsValueModification();
 			}
@@ -38,7 +38,7 @@ public boolean canModify(Object element, String property) {
 
 	@Override
 	public Object getValue(Object element, String property) {
-		if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(property)) {
+		if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE.equals(property)) {
 			if (element instanceof IVariable) {
 				IVariable variable = (IVariable) element;
 				try {
@@ -55,7 +55,7 @@ public Object getValue(Object element, String property) {
 	public void modify(Object element, String property, Object value) {
 		Object oldValue = getValue(element, property);
 		if (!value.equals(oldValue)) {
-			if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(property)) {
+			if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE.equals(property)) {
 				if (element instanceof IVariable) {
 					if (value instanceof String) {
 						// The value column displays special characters escaped, so encode the string with any special characters escaped properly
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java
index 920b8410466..e843d3eb653 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2013 IBM Corporation and others.
+ * Copyright (c) 2006, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -23,35 +23,6 @@
  */
 public class VariableColumnPresentation extends AbstractColumnPresentation {
 
-	/**
-	 * Constant identifier for the default variable column presentation.
-	 * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_PRESENTATION_ID_VARIABLE}
-	 */
-	@Deprecated
-	public final static String DEFAULT_VARIABLE_COLUMN_PRESENTATION = IDebugUIConstants.COLUMN_PRESENTATION_ID_VARIABLE;
-
-	/**
-	 * Default column identifiers
-	 * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_NAME}
-	 */
-	@Deprecated
-	public final static String COLUMN_VARIABLE_NAME = IDebugUIConstants.COLUMN_ID_VARIABLE_NAME;
-	/**
-	 * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_TYPE}
-	 */
-	@Deprecated
-	public final static String COLUMN_VARIABLE_TYPE = IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE;
-	/**
-	 * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_VALUE}
-	 */
-	@Deprecated
-	public final static String COLUMN_VARIABLE_VALUE = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE;
-	/**
-	 * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_VALUE_TYPE}
-	 */
-	@Deprecated
-	public final static String COLUMN_VALUE_TYPE = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE;
-
 	private static final String[] ALL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME,
 		IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE, IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE, IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE};
 	private static final String[] INITIAL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME,
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java
index 0bc7ffddf36..5fc0d00314d 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Wind River Systems and others.
+ * Copyright (c) 2010, 2025 Wind River Systems and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -17,6 +17,7 @@
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IWatchExpression;
 import org.eclipse.debug.internal.ui.DefaultLabelProvider;
+import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.viewers.ICellModifier;
 
 /**
@@ -24,12 +25,11 @@
  *
  * @since 3.6
  */
-@SuppressWarnings("deprecation")
 public class WatchExpressionCellModifier implements ICellModifier {
 
 	@Override
 	public boolean canModify(Object element, String property) {
-		if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
+		if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(property)) {
 			return element instanceof IWatchExpression;
 		}
 		return false;
@@ -37,7 +37,7 @@ public boolean canModify(Object element, String property) {
 
 	@Override
 	public Object getValue(Object element, String property) {
-		if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
+		if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(property)) {
 			return DefaultLabelProvider.escapeSpecialChars( ((IWatchExpression)element).getExpressionText() );
 		}
 		return null;
@@ -47,7 +47,7 @@ public Object getValue(Object element, String property) {
 	public void modify(Object element, String property, Object value) {
 		Object oldValue = getValue(element, property);
 		if (!value.equals(oldValue)) {
-			if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
+			if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(property)) {
 				if (element instanceof IWatchExpression) {
 					if (value instanceof String) {
 						// The value column displays special characters