diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java
index 8722a8d42cb..902f9578db6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java
@@ -135,7 +135,7 @@ public class PDOMIndexerJob extends Job {
 
 					// User cancel, tell manager and return.
 					if (monitor.isCanceled()) {
-						pdomManager.cancelledIndexerJob(cancelledByManager);
+						pdomManager.indexerJobCanceled(cancelledByManager);
 						return Status.CANCEL_STATUS;
 					}
 
@@ -179,7 +179,7 @@ public class PDOMIndexerJob extends Job {
 	}
 
 	private void indexingAborted() {
-		pdomManager.cancelledIndexerJob(true);
+		pdomManager.indexerJobCanceled(true);
 		synchronized (taskMutex) {
 			currentTask= null;
 			taskMutex.notifyAll();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
index 0defa1bad1a..3caabf7bfee 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
@@ -165,8 +165,8 @@ public class PDOMManager implements IWritableIndexManager, IListener {
      */
     private Map<IProject, IPDOM> fProjectToPDOM= new HashMap<>();
     private Map<File, ICProject> fFileToProject= new HashMap<>();
-	private ListenerList fChangeListeners= new ListenerList();
-	private ListenerList fStateListeners= new ListenerList();
+	private ListenerList<IIndexChangeListener> fChangeListeners= new ListenerList<>();
+	private ListenerList<IIndexerStateListener> fStateListeners= new ListenerList<>();
 
 	private IndexChangeEvent fIndexChangeEvent= new IndexChangeEvent();
 	private IndexerStateEvent fIndexerStateEvent= new IndexerStateEvent();
@@ -714,7 +714,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
     	return result;
     }
 
-    void cancelledIndexerJob(boolean byManager) {
+    void indexerJobCanceled(boolean byManager) {
     	synchronized (fTaskQueue) {
     		fCurrentTask= null;
     		if (!byManager) {