diff --git a/spring-boot-samples/spring-boot-sample-data-couchbase/src/main/java/sample/data/couchbase/SampleCouchbaseApplication.java b/spring-boot-samples/spring-boot-sample-data-couchbase/src/main/java/sample/data/couchbase/SampleCouchbaseApplication.java
index 6855b9731d8..ded7f839125 100644
--- a/spring-boot-samples/spring-boot-sample-data-couchbase/src/main/java/sample/data/couchbase/SampleCouchbaseApplication.java
+++ b/spring-boot-samples/spring-boot-sample-data-couchbase/src/main/java/sample/data/couchbase/SampleCouchbaseApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public class SampleCouchbaseApplication implements CommandLineRunner {
 	public void run(String... args) throws Exception {
 		this.userRepository.deleteAll();
 		User user = saveUser();
-		System.out.println(this.userRepository.findOne(user.getId()));
+		System.out.println(this.userRepository.findById(user.getId()));
 	}
 
 	private User saveUser() {
diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java b/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java
index f7b72ed922d..07d2fea4a43 100644
--- a/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java
+++ b/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java
@@ -32,7 +32,7 @@ public interface FlightRepository extends CrudRepository<Flight, Long> {
 	Iterable<Flight> findAll();
 
 	@Override
-	Optional<Flight> findOne(Long aLong);
+	Optional<Flight> findById(Long aLong);
 
 	@Override
 	<S extends Flight> S save(S entity);
diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java b/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java
index 0666df8cfbc..6f2da766baf 100644
--- a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java
+++ b/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java
@@ -35,7 +35,7 @@ public interface FlightRepository extends CrudRepository<Flight, Long> {
 
 	@Override
 	@PreAuthorize("#oauth2.hasScope('read')")
-	Optional<Flight> findOne(Long aLong);
+	Optional<Flight> findById(Long aLong);
 
 	@Override
 	@PreAuthorize("#oauth2.hasScope('write')")