diff --git a/exist-core/src/main/java/org/exist/http/urlrewrite/ModuleCall.java b/exist-core/src/main/java/org/exist/http/urlrewrite/ModuleCall.java
index 62ff6d52e2..5835b92cf1 100644
--- a/exist-core/src/main/java/org/exist/http/urlrewrite/ModuleCall.java
+++ b/exist-core/src/main/java/org/exist/http/urlrewrite/ModuleCall.java
@@ -115,7 +115,7 @@ protected ModuleCall(final ModuleCall other) {
     @Override
     public void doRewrite(final HttpServletRequest request, final HttpServletResponse response) throws ServletException {
         try {
-            final ContextItemDeclaration cid = call.getContext().getContextItemDeclartion();
+            final ContextItemDeclaration cid = call.getContext().getContextItemDeclaration();
             final Sequence contextSequence;
             if (cid != null) {
                 contextSequence = cid.eval(null, null);
diff --git a/exist-core/src/main/java/org/exist/security/internal/SMEvents.java b/exist-core/src/main/java/org/exist/security/internal/SMEvents.java
index f7a78ee2c1..ea410da8ea 100644
--- a/exist-core/src/main/java/org/exist/security/internal/SMEvents.java
+++ b/exist-core/src/main/java/org/exist/security/internal/SMEvents.java
@@ -123,7 +123,7 @@ protected void runScript(Subject subject, String scriptURI, String script, QName
     	            }
 
 					final Sequence contextSequence;
-					final ContextItemDeclaration cid = context.getContextItemDeclartion();
+					final ContextItemDeclaration cid = context.getContextItemDeclaration();
 					if(cid != null) {
 						contextSequence = cid.eval(null, null);
 					} else {
diff --git a/exist-core/src/main/java/org/exist/xquery/RootNode.java b/exist-core/src/main/java/org/exist/xquery/RootNode.java
index 548e20699f..9ccb4d49ad 100644
--- a/exist-core/src/main/java/org/exist/xquery/RootNode.java
+++ b/exist-core/src/main/java/org/exist/xquery/RootNode.java
@@ -72,7 +72,7 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
         }
 
         // second, check if a context item is declared
-        final ContextItemDeclaration decl = context.getContextItemDeclartion();
+        final ContextItemDeclaration decl = context.getContextItemDeclaration();
         if (decl != null) {
             final Sequence seq = decl.eval(null, null);
             if (!seq.isEmpty()) {
diff --git a/exist-core/src/main/java/org/exist/xquery/XQuery.java b/exist-core/src/main/java/org/exist/xquery/XQuery.java
index 2009777436..f857ae3179 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQuery.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQuery.java
@@ -411,8 +411,8 @@ public Sequence execute(final DBBroker broker, final CompiledXQuery expression,
 
                 // support for XQuery 3.0 - declare context item :=
                 if(contextSequence == null) {
-                    if(context.getContextItemDeclartion() != null) {
-                        contextSequence = context.getContextItemDeclartion().eval(null, null);
+                    if(context.getContextItemDeclaration() != null) {
+                        contextSequence = context.getContextItemDeclaration().eval(null, null);
                     }
                 }
 
diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index a7dfd9aa25..246c1274ce 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -799,7 +799,7 @@ public void setContextItemDeclaration(final ContextItemDeclaration contextItemDe
         this.contextItemDeclaration = contextItemDeclaration;
     }
 
-    public ContextItemDeclaration getContextItemDeclartion() {
+    public ContextItemDeclaration getContextItemDeclaration() {
         return contextItemDeclaration;
     }
 
diff --git a/extensions/indexes/range/src/main/java/org/exist/indexing/range/RangeIndexConfigAttributeCondition.java b/extensions/indexes/range/src/main/java/org/exist/indexing/range/RangeIndexConfigAttributeCondition.java
index 697d7c2006..b7f6133da8 100644
--- a/extensions/indexes/range/src/main/java/org/exist/indexing/range/RangeIndexConfigAttributeCondition.java
+++ b/extensions/indexes/range/src/main/java/org/exist/indexing/range/RangeIndexConfigAttributeCondition.java
@@ -47,7 +47,6 @@
 
 import org.exist.dom.QName;
 import org.exist.dom.persistent.ElementImpl;
-import org.exist.dom.persistent.NodeImpl;
 import org.exist.storage.ElementValue;
 import org.exist.storage.NodePath;
 import org.exist.util.DatabaseConfigurationException;
@@ -456,7 +455,7 @@ else if (expr instanceof LiteralValue) {
         } else if (expr instanceof VariableReference || expr instanceof Function) {
             try {
                 final Sequence contextSequence;
-                final ContextItemDeclaration cid = expr.getContext().getContextItemDeclartion();
+                final ContextItemDeclaration cid = expr.getContext().getContextItemDeclaration();
                 if(cid != null) {
                     contextSequence = cid.eval(null, null);
                 } else {