diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_003.xtend b/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_003.xtend
index a28695b1268..481af21d1eb 100644
--- a/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_003.xtend
+++ b/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_003.xtend
@@ -22,7 +22,7 @@ import com.google.common.collect.AbstractIterator
 class Solution_003 extends AbstractIterator<Long> {
 
 	def static void main(String[] args) {
-		println(new Solution_003().last)
+		println(new Solution_003().lastOrNull)
 	}
 
 	long compound = 600851475143L
diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_015b.xtend b/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_015b.xtend
index 2ee64fa7606..8ff68d34fa1 100644
--- a/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_015b.xtend
+++ b/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_015b.xtend
@@ -28,6 +28,6 @@ class Solution_015b {
 				set(col, get(col - 1) + get(col))
 			]
 		]
-		println(last)
+		println(lastOrNull)
 	}
 }
\ No newline at end of file
diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_025.xtend b/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_025.xtend
index ff89e8731d9..eaff5437d4d 100644
--- a/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_025.xtend
+++ b/org.eclipse.xtend.examples/projects/xtend-euler/src/euler/Solution_025.xtend
@@ -43,7 +43,7 @@ import com.google.common.collect.AbstractIterator
 class Solution_025 extends AbstractIterator<Integer> {
 
 	def static void main(String[] args) {
-		println(new Solution_025().last)
+		println(new Solution_025().lastOrNull)
 	}
 
 	BigInteger max = 10bi.pow(999)
diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_003.java b/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_003.java
index 577a5fc9221..bfa21717852 100644
--- a/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_003.java
+++ b/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_003.java
@@ -27,7 +27,7 @@
 @SuppressWarnings("all")
 public class Solution_003 extends AbstractIterator<Long> {
   public static void main(final String[] args) {
-    InputOutput.<Long>println(IteratorExtensions.<Long>last(new Solution_003()));
+    InputOutput.<Long>println(IteratorExtensions.<Long>lastOrNull(new Solution_003()));
   }
 
   private long compound = 600851475143L;
diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_015b.java b/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_015b.java
index 9d84566ff39..33184293e49 100644
--- a/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_015b.java
+++ b/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_015b.java
@@ -43,6 +43,6 @@ public static void main(final String[] args) {
       new IntegerRange(1, gridSize).forEach(_function_2);
     };
     new IntegerRange(1, gridSize).forEach(_function_1);
-    InputOutput.<Long>println(IterableExtensions.<Long>last(it));
+    InputOutput.<Long>println(IterableExtensions.<Long>lastOrNull(it));
   }
 }
diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_025.java b/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_025.java
index 15478d52b34..61bc5b41942 100644
--- a/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_025.java
+++ b/org.eclipse.xtend.examples/projects/xtend-euler/xtend-gen/euler/Solution_025.java
@@ -45,7 +45,7 @@
 @SuppressWarnings("all")
 public class Solution_025 extends AbstractIterator<Integer> {
   public static void main(final String[] args) {
-    InputOutput.<Integer>println(IteratorExtensions.<Integer>last(new Solution_025()));
+    InputOutput.<Integer>println(IteratorExtensions.<Integer>lastOrNull(new Solution_025()));
   }
 
   private BigInteger max = BigInteger.TEN.pow(999);