diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index a4011e6ddd7..9744ce71a72 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,6 @@
+2002-10-25 Mikhail Khodjaiants
+	* IFormattedMemoryBlock.java: Replaced 'MEMORY_BYTES_PER_ROW_...' constants by 'MEMORY_NUMBER_OF_COLUMNS_...'.
+
 2002-10-25 Mikhail Khodjaiants
 	Remove the 'setWordSize' method from 'IFormattedMemoryBlock' and use 'reformat' instead.
 	* IFormattedMemoryBlock.java: removed the 'setWordSize' method.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java
index 8299e9dabdf..38783edfbc4 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java
@@ -30,12 +30,11 @@ public interface IFormattedMemoryBlock extends IMemoryBlock
 	public static final int MEMORY_FORMAT_SIGNED_DECIMAL = 3;
 	public static final int MEMORY_FORMAT_UNSIGNED_DECIMAL = 4;
 
-	public static final int MEMORY_BYTES_PER_ROW_4 = 4;
-	public static final int MEMORY_BYTES_PER_ROW_8 = 8;
-	public static final int MEMORY_BYTES_PER_ROW_16 = 16;
-	public static final int MEMORY_BYTES_PER_ROW_32 = 32;
-	public static final int MEMORY_BYTES_PER_ROW_64 = 64;
-	public static final int MEMORY_BYTES_PER_ROW_128 = 128;
+	public static final int MEMORY_NUMBER_OF_COLUMNS_1 = 1;
+	public static final int MEMORY_NUMBER_OF_COLUMNS_2 = 2;
+	public static final int MEMORY_NUMBER_OF_COLUMNS_4 = 4;
+	public static final int MEMORY_NUMBER_OF_COLUMNS_8 = 8;
+	public static final int MEMORY_NUMBER_OF_COLUMNS_16 = 16;
 
 	/**
 	 * Returns the address expression specified to obtain this memory block.