diff --git a/src/main/java/de/espend/idea/php/annotation/completion/PhpAnnotationCompletionConfidence.java b/src/main/java/de/espend/idea/php/annotation/completion/PhpAnnotationCompletionConfidence.java
index 56191bd..49c0b21 100644
--- a/src/main/java/de/espend/idea/php/annotation/completion/PhpAnnotationCompletionConfidence.java
+++ b/src/main/java/de/espend/idea/php/annotation/completion/PhpAnnotationCompletionConfidence.java
@@ -6,8 +6,8 @@
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.util.ThreeState;
 import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes;
-import com.jetbrains.php.lang.documentation.phpdoc.parser.BasicPhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocElementTypes;
+import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.patterns.PhpPatterns;
 import com.jetbrains.php.lang.psi.PhpFile;
@@ -53,7 +53,7 @@ public ThreeState shouldSkipAutopopup(@NotNull PsiElement contextElement, @NotNu
             }
 
             // @<|>
-            if(PhpPatterns.psiElement(BasicPhpDocStubElementTypes.phpDocTag).accepts(context)) {
+            if(PhpPatterns.psiElement(PhpDocStubElementTypes.phpDocTag).accepts(context)) {
                 return ThreeState.NO;
             }
 
diff --git a/src/main/java/de/espend/idea/php/annotation/pattern/AnnotationPattern.java b/src/main/java/de/espend/idea/php/annotation/pattern/AnnotationPattern.java
index f7824a0..43a8061 100644
--- a/src/main/java/de/espend/idea/php/annotation/pattern/AnnotationPattern.java
+++ b/src/main/java/de/espend/idea/php/annotation/pattern/AnnotationPattern.java
@@ -9,8 +9,8 @@
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.php.lang.PhpLanguage;
 import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes;
-import com.jetbrains.php.lang.documentation.phpdoc.parser.BasicPhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocElementTypes;
+import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocPsiElement;
 import com.jetbrains.php.lang.lexer.PhpTokenTypes;
@@ -76,7 +76,7 @@ public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext process
 
             )
             .inside(PlatformPatterns
-                .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                .psiElement(PhpDocStubElementTypes.phpDocTag)
             )
             .withLanguage(PhpLanguage.INSTANCE);
     }
@@ -104,7 +104,7 @@ public static ElementPattern<PsiElement> getTextIdentifier() {
                 .withParent(PlatformPatterns
                     .psiElement(PhpDocElementTypes.phpDocAttributeList)
                     .withParent(PlatformPatterns
-                        .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                        .psiElement(PhpDocStubElementTypes.phpDocTag)
                     )
                 )
             );
@@ -146,7 +146,7 @@ public static PsiElementPattern.Capture<PsiElement> getDefaultPropertyValue() {
             .withParent(PlatformPatterns.psiElement(StringLiteralExpression.class).withParent(PlatformPatterns
                 .psiElement(PhpDocElementTypes.phpDocAttributeList)
                 .withParent(PlatformPatterns
-                    .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                    .psiElement(PhpDocStubElementTypes.phpDocTag)
                 )
             ))
             .withLanguage(PhpLanguage.INSTANCE);
@@ -164,7 +164,7 @@ public static ElementPattern<StringLiteralExpression> getDefaultPropertyValueStr
              .withParent(PlatformPatterns
                  .psiElement(PhpDocElementTypes.phpDocAttributeList)
                  .withParent(PlatformPatterns
-                     .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                     .psiElement(PhpDocStubElementTypes.phpDocTag)
                  )
              )
              .withLanguage(PhpLanguage.INSTANCE);
@@ -182,7 +182,7 @@ public static ElementPattern<StringLiteralExpression> getPropertyValueString() {
                 .withParent(PlatformPatterns
                         .psiElement(PhpDocElementTypes.phpDocAttributeList)
                         .withParent(PlatformPatterns
-                                .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                                .psiElement(PhpDocStubElementTypes.phpDocTag)
                         )
                 )
                 .withLanguage(PhpLanguage.INSTANCE);