diff --git a/src/adql/parser/feature/LanguageFeature.java b/src/adql/parser/feature/LanguageFeature.java
index 24414409..bbc8fe06 100644
--- a/src/adql/parser/feature/LanguageFeature.java
+++ b/src/adql/parser/feature/LanguageFeature.java
@@ -255,7 +255,7 @@ private LanguageFeature(final String type, final String form, final FunctionDef
 			throw new NullPointerException("Missing form/name of the language feature to create!");
 		this.form = form.trim();
 
-		if (TYPE_UDF.equals(this.type) && udfDef == null)
+		if (TYPE_UDF.equalsIgnoreCase(this.type) && udfDef == null)
 			throw new NullPointerException("Missing UDF definition! To declare a UDF feature, you MUST use the constructor LanguageFeature(FunctionDef, ...) with a non-NULL FunctionDef instance.");
 		this.udfDefinition = udfDef;
 
@@ -270,12 +270,12 @@ private LanguageFeature(final String type, final String form, final FunctionDef
 	public boolean equals(final Object obj) {
 		if ((obj != null) && (obj instanceof LanguageFeature)) {
 			// If UDF, equals IF SAME NAME and SAME NB PARAMETERS:
-			if (TYPE_UDF.equals(type) && type.equals(((LanguageFeature)obj).type)) {
+			if (TYPE_UDF.equalsIgnoreCase(type) && type.equalsIgnoreCase(((LanguageFeature)obj).type)) {
 				FunctionDef udfDefinition2 = ((LanguageFeature)obj).udfDefinition;
 				return udfDefinition.name.equalsIgnoreCase(udfDefinition2.name) && (udfDefinition.nbParams == udfDefinition2.nbParams);
 			}
 			// Otherwise, equals IF SAME ID:
-			else if (id.equals(((LanguageFeature)obj).id))
+			else if (id.equalsIgnoreCase(((LanguageFeature)obj).id))
 				return true;
 		}
 		return false;
@@ -284,9 +284,9 @@ else if (id.equals(((LanguageFeature)obj).id))
 	@Override
 	public int hashCode() {
 		if (udfDefinition != null)
-			return Objects.hash(type, udfDefinition.name.toLowerCase(), udfDefinition.nbParams);
+			return Objects.hash(type == null ? null : type.toLowerCase(), udfDefinition.name.toLowerCase(), udfDefinition.nbParams);
 		else
-			return Objects.hash(type, form, -1);
+			return Objects.hash(type == null ? null : type.toLowerCase(), form, -1);
 	}
 
 	@Override
diff --git a/test/adql/parser/feature/TestLanguageFeature.java b/test/adql/parser/feature/TestLanguageFeature.java
index 3e161ad1..884005f3 100644
--- a/test/adql/parser/feature/TestLanguageFeature.java
+++ b/test/adql/parser/feature/TestLanguageFeature.java
@@ -103,6 +103,12 @@ public void testEquals() {
 		// the test order does not matter:
 		assertTrue(feat2.equals(feat1));
 
+                // CASE: equality test with differing capitalisation of type
+                LanguageFeature feat3 = new LanguageFeature("ivo://stuff", "bar");
+                LanguageFeature feat4 = new LanguageFeature("ivo://Stuff", "bar");
+                assertTrue(feat3.equals(feat4));
+                assertTrue(feat4.equals(feat3));
+
 		try {
 
 			// CASE: equality test between 2 UDFs with a different name => false