diff --git a/src/main/java/org/variantsync/diffdetective/datasets/PatchDiffParseOptions.java b/src/main/java/org/variantsync/diffdetective/datasets/PatchDiffParseOptions.java
index 7d9be594..10fbe15c 100644
--- a/src/main/java/org/variantsync/diffdetective/datasets/PatchDiffParseOptions.java
+++ b/src/main/java/org/variantsync/diffdetective/datasets/PatchDiffParseOptions.java
@@ -1,6 +1,6 @@
 package org.variantsync.diffdetective.datasets;
 
-import org.variantsync.diffdetective.feature.PreprocessorAnnotationParser;
+import org.variantsync.diffdetective.feature.AnnotationParser;
 import org.variantsync.diffdetective.variation.diff.parse.VariationDiffParseOptions;
 
 /**
@@ -27,7 +27,7 @@ public enum DiffStoragePolicy {
     /**
      * Creates PatchDiffParseOptions with the given annotation parser.
      */
-    public PatchDiffParseOptions withAnnotationParser(PreprocessorAnnotationParser annotationParser) {
+    public PatchDiffParseOptions withAnnotationParser(AnnotationParser annotationParser) {
         return new PatchDiffParseOptions(
                 this.diffStoragePolicy(),
                 this.variationDiffParseOptions().withAnnotationParser(annotationParser)
diff --git a/src/main/java/org/variantsync/diffdetective/variation/diff/parse/VariationDiffParseOptions.java b/src/main/java/org/variantsync/diffdetective/variation/diff/parse/VariationDiffParseOptions.java
index 6af0675c..1269e946 100644
--- a/src/main/java/org/variantsync/diffdetective/variation/diff/parse/VariationDiffParseOptions.java
+++ b/src/main/java/org/variantsync/diffdetective/variation/diff/parse/VariationDiffParseOptions.java
@@ -6,7 +6,7 @@
 /**
  * Parse options that should be used when parsing {@link org.variantsync.diffdetective.variation.diff.VariationDiff}s.
  *
- * @param annotationParser          A parser for parsing c preprocessor annotations.
+ * @param annotationParser          A parser for parsing annotations.
  * @param collapseMultipleCodeLines Whether multiple consecutive code lines with the same diff
  *                                  type should be collapsed into a single artifact node.
  * @param ignoreEmptyLines          Whether to add {@code DiffNode}s for empty lines (regardless of their {@code DiffType}).
@@ -37,7 +37,7 @@ public VariationDiffParseOptions(
     /**
      * Creates VariationDiffParseOptions with the given annotation parser.
      */
-    public VariationDiffParseOptions withAnnotationParser(PreprocessorAnnotationParser annotationParser) {
+    public VariationDiffParseOptions withAnnotationParser(AnnotationParser annotationParser) {
         return new VariationDiffParseOptions(
                 annotationParser,
                 this.collapseMultipleCodeLines(),