--- trunk/src/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java (revision 15770)
+++ trunk/src/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java (revision 17897)
@@ -109,4 +109,10 @@
 		}
 		if (type != null) {
+//{ObjectTeams: hierarchy scope must also be applied to (member) types
+// 			    (has only been applied to the resource before):
+		  if (   !(scope instanceof HierarchyScope)
+			  || !type.isMember()
+			  || scope.encloses(type))
+// SH}
 			this.requestor.acceptTypeNameMatch(new JavaSearchTypeNameMatch(type, modifiers));
 		}