diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java
index 9ea844a6..0cca8e9d 100644
--- a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java
+++ b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java
@@ -151,7 +151,7 @@ public abstract class LuceneAccessor extends LuceneOperationsSupport implements
 	 * @see #createLuceneQueryFactory()
 	 */
 	public LuceneQueryFactory createLuceneQueryFactory(int resultLimit, int pageSize) {
-		return createLuceneQueryFactory().setResultLimit(resultLimit).setPageSize(pageSize);
+		return createLuceneQueryFactory().setLimit(resultLimit).setPageSize(pageSize);
 	}
 
 	/**
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java
index 40372ca0..a5bbe60a 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java
@@ -136,13 +136,13 @@ public class LuceneAccessorUnitTests {
 		doReturn(mockLuceneService).when(luceneAccessor).resolveLuceneService();
 		when(mockLuceneService.createLuceneQueryFactory()).thenReturn(mockLuceneQueryFactory);
 		when(mockLuceneQueryFactory.setPageSize(anyInt())).thenReturn(mockLuceneQueryFactory);
-		when(mockLuceneQueryFactory.setResultLimit(anyInt())).thenReturn(mockLuceneQueryFactory);
+		when(mockLuceneQueryFactory.setLimit(anyInt())).thenReturn(mockLuceneQueryFactory);
 
 		assertThat(luceneAccessor.createLuceneQueryFactory(1000)).isEqualTo(mockLuceneQueryFactory);
 
 		verify(luceneAccessor).resolveLuceneService();
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(1000));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(1000));
 		verify(mockLuceneQueryFactory, times(1))
 			.setPageSize(eq(LuceneAccessor.DEFAULT_PAGE_SIZE));
 	}
@@ -153,14 +153,14 @@ public class LuceneAccessorUnitTests {
 		doReturn(mockLuceneService).when(luceneAccessor).resolveLuceneService();
 		when(mockLuceneService.createLuceneQueryFactory()).thenReturn(mockLuceneQueryFactory);
 		when(mockLuceneQueryFactory.setPageSize(anyInt())).thenReturn(mockLuceneQueryFactory);
-		when(mockLuceneQueryFactory.setResultLimit(anyInt())).thenReturn(mockLuceneQueryFactory);
+		when(mockLuceneQueryFactory.setLimit(anyInt())).thenReturn(mockLuceneQueryFactory);
 
 		assertThat(luceneAccessor.createLuceneQueryFactory(1000, 20))
 			.isEqualTo(mockLuceneQueryFactory);
 
 		verify(luceneAccessor).resolveLuceneService();
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(1000));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(1000));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(20));
 	}
 
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java
index a6de6688..b5c30f87 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java
@@ -100,7 +100,7 @@ public class LuceneTemplateUnitTests {
 
 		when(mockLuceneService.createLuceneQueryFactory()).thenReturn(mockLuceneQueryFactory);
 		when(mockLuceneQueryFactory.setPageSize(anyInt())).thenReturn(mockLuceneQueryFactory);
-		when(mockLuceneQueryFactory.setResultLimit(anyInt())).thenReturn(mockLuceneQueryFactory);
+		when(mockLuceneQueryFactory.setLimit(anyInt())).thenReturn(mockLuceneQueryFactory);
 	}
 
 	@Test
@@ -125,7 +125,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq("title : Up Shit Creek Without a Paddle"), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(LuceneOperations.DEFAULT_PAGE_SIZE));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq("title : Up Shit Creek Without a Paddle"), eq("title"));
@@ -152,7 +152,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq("title : Up Shit Creek Without a Paddle"), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(20));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq("title : Up Shit Creek Without a Paddle"), eq("title"));
@@ -181,7 +181,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq(mockLuceneQueryProvider), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(LuceneOperations.DEFAULT_PAGE_SIZE));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq(mockLuceneQueryProvider));
@@ -208,7 +208,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq(mockLuceneQueryProvider), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(20));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq(mockLuceneQueryProvider));
@@ -237,7 +237,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq("title : Up Shit Creek Without a Paddle"), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(LuceneOperations.DEFAULT_PAGE_SIZE));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq("title : Up Shit Creek Without a Paddle"), eq("title"));
@@ -265,7 +265,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq(mockLuceneQueryProvider), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(LuceneOperations.DEFAULT_PAGE_SIZE));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq(mockLuceneQueryProvider));
@@ -294,7 +294,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq("title : Up Shit Creek Without a Paddle"), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(LuceneOperations.DEFAULT_PAGE_SIZE));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq("title : Up Shit Creek Without a Paddle"), eq("title"));
@@ -322,7 +322,7 @@ public class LuceneTemplateUnitTests {
 		verify(luceneTemplate, times(1)).doFind(isA(LuceneQueryExecutor.class),
 			eq(mockLuceneQueryProvider), eq("/Example"), eq("TestIndex"));
 		verify(mockLuceneService, times(1)).createLuceneQueryFactory();
-		verify(mockLuceneQueryFactory, times(1)).setResultLimit(eq(100));
+		verify(mockLuceneQueryFactory, times(1)).setLimit(eq(100));
 		verify(mockLuceneQueryFactory, times(1)).setPageSize(eq(LuceneOperations.DEFAULT_PAGE_SIZE));
 		verify(mockLuceneQueryFactory, times(1)).create(eq("TestIndex"),
 			eq("/Example"), eq(mockLuceneQueryProvider));