diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c33163b87b9..a3e68b92fbf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-12-02  Aditya Kumar  <aditya.k7@samsung.com>
+	    Sebastian Pop  <s.pop@samsung.com>
+
+	* common.opt (flag_loop_optimize_isl): Renamed flag_loop_nest_optimize.
+	* graphite-poly.c (apply_poly_transforms): Same.
+	* graphite.c (gate_graphite_transforms): Same.
+	* toplev.c (process_options): Same.
+
 2015-12-02  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* config/mips/mips.c (mips_emit_probe_stack_range): Adjust.
diff --git a/gcc/common.opt b/gcc/common.opt
index e1617c41bd8..e593631b5f2 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1379,7 +1379,7 @@ Common Ignore
 Does nothing. Preserved for backward compatibility.
 
 floop-nest-optimize
-Common Report Var(flag_loop_optimize_isl) Optimization
+Common Report Var(flag_loop_nest_optimize) Optimization
 Enable the ISL based loop nest optimizer.
 
 fstrict-volatile-bitfields
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index a51aefe574c..f4bdd401877 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -122,7 +122,7 @@ apply_poly_transforms (scop_p scop)
   if (flag_loop_parallelize_all)
     transform_done = true;
 
-  if (flag_loop_optimize_isl)
+  if (flag_loop_nest_optimize)
     transform_done |= optimize_isl (scop);
 
   return transform_done;
diff --git a/gcc/graphite.c b/gcc/graphite.c
index ee1d2117114..83aa88b3284 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -372,7 +372,7 @@ gate_graphite_transforms (void)
      is turned on.  */
   if (flag_graphite_identity
       || flag_loop_parallelize_all
-      || flag_loop_optimize_isl)
+      || flag_loop_nest_optimize)
     flag_graphite = 1;
 
   return flag_graphite != 0;
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 5aade2fb739..aee55fc932b 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1237,7 +1237,7 @@ process_options (void)
 
 #ifndef HAVE_isl
   if (flag_graphite
-      || flag_loop_optimize_isl
+      || flag_loop_nest_optimize
       || flag_graphite_identity
       || flag_loop_parallelize_all)
     sorry ("Graphite loop optimizations cannot be used (ISL is not available)"