diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/RefreshAction.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/RefreshAction.java
index af07e864ea0..6611cc7d268 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/RefreshAction.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/RefreshAction.java
@@ -12,7 +12,7 @@
 
 package org.eclipse.dd.dsf.debug.internal.provisional.ui.memory;
 
-import org.eclipse.dd.dsf.debug.memory.IMemoryBlockUpdatePolicy;
+import org.eclipse.dd.dsf.debug.internal.provisional.model.IMemoryBlockUpdatePolicyProvider;
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.IDebugEventSetListener;
 import org.eclipse.debug.core.model.IMemoryBlock;
@@ -38,9 +38,9 @@ public class RefreshAction implements IViewActionDelegate {
 
 	public void run(IAction action) {
 		
-		if(fMemoryBlock instanceof IMemoryBlockUpdatePolicy)
+		if(fMemoryBlock instanceof IMemoryBlockUpdatePolicyProvider)
 		{
-			((IMemoryBlockUpdatePolicy) fMemoryBlock).clearCache();
+			((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).clearCache();
 			IMemoryRenderingContainer containers[] = fView.getMemoryRenderingContainers();
 			for(int i = 0; i < containers.length; i++)
 			{
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java
index 5dd0b507021..2ce67fb6ada 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java
@@ -12,7 +12,7 @@
 
 package org.eclipse.dd.dsf.debug.internal.provisional.ui.memory;
 
-import org.eclipse.dd.dsf.debug.memory.IMemoryBlockUpdatePolicy;
+import org.eclipse.dd.dsf.debug.internal.provisional.model.IMemoryBlockUpdatePolicyProvider;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.ui.contexts.DebugContextEvent;
 import org.eclipse.debug.ui.contexts.IDebugContextListener;
@@ -69,7 +69,7 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
 
 		@Override
 		public void run() {
-            ((IMemoryBlockUpdatePolicy) fMemoryBlock).setUpdatePolicy(fID);
+            ((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).setUpdatePolicy(fID);
             fUpdatePolicy = fID;
         }
     
@@ -115,13 +115,13 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
     		
     		if(fMemoryBlock != null)
     		{
-    			if(fMemoryBlock instanceof IMemoryBlockUpdatePolicy)
+    			if(fMemoryBlock instanceof IMemoryBlockUpdatePolicyProvider)
     	    	{
-    	    		String currentPolicy = ((IMemoryBlockUpdatePolicy) fMemoryBlock).getUpdatePolicy();
+    	    		String currentPolicy = ((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).getUpdatePolicy();
     	    		if(fUpdatePolicy == null)
     	    			fUpdatePolicy = currentPolicy;
     	    		
-    	    		((IMemoryBlockUpdatePolicy) fMemoryBlock).setUpdatePolicy(fUpdatePolicy);
+    	    		((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).setUpdatePolicy(fUpdatePolicy);
     	    	}
     		}
     	}
@@ -147,9 +147,9 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
     }
 
     private void fillMenu(Menu menu) {
-    	if(fMemoryBlock instanceof IMemoryBlockUpdatePolicy)
+    	if(fMemoryBlock instanceof IMemoryBlockUpdatePolicyProvider)
     	{
-    		IMemoryBlockUpdatePolicy blockPolicy = (IMemoryBlockUpdatePolicy) fMemoryBlock;
+    		IMemoryBlockUpdatePolicyProvider blockPolicy = (IMemoryBlockUpdatePolicyProvider) fMemoryBlock;
     		
     		String currentPolicy = blockPolicy.getUpdatePolicy();