diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/Robot.cpp
index 1c5ee1d0cc..a258a8aa23 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/Robot.cpp
@@ -7,7 +7,7 @@
 
 #include <Commands/Command.h>
 #include <Commands/Scheduler.h>
-#include <IterativeRobot.h>
+#include <TimedRobot.h>
 #include <LiveWindow/LiveWindow.h>
 #include <SmartDashboard/SendableChooser.h>
 #include <SmartDashboard/SmartDashboard.h>
@@ -15,7 +15,7 @@
 #include "Commands/ExampleCommand.h"
 #include "Commands/MyAutoCommand.h"
 
-class Robot : public frc::IterativeRobot {
+class Robot : public frc::TimedRobot {
 public:
 	void RobotInit() override {
 		m_chooser.AddDefault("Default Auto", &m_defaultAuto);
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java
index c6173543aa..d953d91e7b 100644
--- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java
+++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java
@@ -7,7 +7,7 @@
 
 package edu.wpi.first.wpilibj.templates.commandbased;
 
-import edu.wpi.first.wpilibj.IterativeRobot;
+import edu.wpi.first.wpilibj.TimedRobot;
 import edu.wpi.first.wpilibj.command.Command;
 import edu.wpi.first.wpilibj.command.Scheduler;
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
@@ -18,12 +18,12 @@ import edu.wpi.first.wpilibj.templates.commandbased.subsystems.ExampleSubsystem;
 
 /**
  * The VM is configured to automatically run this class, and to call the
- * functions corresponding to each mode, as described in the IterativeRobot
+ * functions corresponding to each mode, as described in the TimedRobot
  * documentation. If you change the name of this class or the package after
  * creating this project, you must also update the build.properties file in the
  * project.
  */
-public class Robot extends IterativeRobot {
+public class Robot extends TimedRobot {
 
 	public static final ExampleSubsystem kExampleSubsystem
 			= new ExampleSubsystem();