diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
index bba2ef488..32d0812ae 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
@@ -218,7 +218,7 @@ public void doWithPersistentProperty(final CouchbasePersistentProperty prop) {
 				if (path != null && path.length() != 0) {
 					sb.append(path);
 				}
-				sb.append(prop.getName());
+				sb.append(prop.getFieldName());
 				sb.append('`');
 				// }
 			}
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
index d0ccf83ff..72ec1bbe8 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
@@ -156,8 +156,11 @@ void annotatedFieldFind() {
 			person = new Person(1, "first", "last");
 			person.setMiddlename("Nick"); // middlename is stored as nickname
 			personRepository.save(person);
-			List<Person> persons2 = personRepository.findByMiddlename("Nick");
-			assertEquals(1, persons2.size());
+			Person person2 = personRepository.findById(person.getId().toString()).get();
+			assertEquals(person.getMiddlename(), person2.getMiddlename());
+			List<Person> persons3 = personRepository.findByMiddlename("Nick");
+			assertEquals(1, persons3.size());
+			assertEquals(person.getMiddlename(), persons3.get(0).getMiddlename());
 		} finally {
 			personRepository.deleteById(person.getId().toString());
 		}