diff --git a/litho-it/src/test/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminatorTest.java b/litho-it/src/test/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminatorTest.java
index 062c90b1d45..a241d30f4c0 100644
--- a/litho-it/src/test/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminatorTest.java
+++ b/litho-it/src/test/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminatorTest.java
@@ -20,9 +20,9 @@
 
 import com.facebook.litho.specmodels.model.SpecElementType;
 import com.google.testing.compile.CompilationRule;
-import javax.annotation.Nullable;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
+import org.jetbrains.annotations.NotNull;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,7 +38,7 @@ public class SpecElementTypeDeterminatorTest {
    * for.
    */
   public static class FakeKotlinSingleton {
-    @Nullable public static final FakeKotlinSingleton INSTANCE = null;
+    @NotNull public static final FakeKotlinSingleton INSTANCE = null;
   }
 
   @Test
diff --git a/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminator.java b/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminator.java
index 5e5ae00418f..5701122cc05 100644
--- a/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminator.java
+++ b/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminator.java
@@ -22,6 +22,9 @@
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
 
 public class SpecElementTypeDeterminator {
   static boolean isKotlinSingleton(TypeElement element) {
@@ -72,6 +75,8 @@ static boolean isPublicStaticFinalElement(Element e) {
   }
 
   static boolean isElementWithTypeName(Element e, String name) {
-    return e.asType().toString().equals(name);
+    TypeMirror type = e.asType();
+    return type.getKind() == TypeKind.DECLARED
+        && ((TypeElement) ((DeclaredType) type).asElement()).getQualifiedName().contentEquals(name);
   }
 }