Modify Games, Players, Tasks to use new template