diff --git a/src/goto-programs/goto_convert.cpp b/src/goto-programs/goto_convert.cpp
index 4181f49c33..eaba18f54f 100644
--- a/src/goto-programs/goto_convert.cpp
+++ b/src/goto-programs/goto_convert.cpp
@@ -445,8 +445,8 @@ void goto_convertt::convert(
     convert_continue(to_code_continue(code), dest);
   else if(statement==ID_goto)
     convert_goto(code, dest);
-  else if(statement=="computed-goto")
-    convert_computed_goto(code, dest);
+  else if(statement==ID_gcc_computed_goto)
+    convert_gcc_computed_goto(code, dest);
   else if(statement==ID_skip)
     convert_skip(code, dest);
   else if(statement=="non-deterministic-goto")
@@ -1531,7 +1531,7 @@ void goto_convertt::convert_goto(
 
 /*******************************************************************\
 
-Function: goto_convertt::convert_computed_goto
+Function: goto_convertt::convert_gcc_computed_goto
 
   Inputs:
 
@@ -1541,7 +1541,7 @@ Function: goto_convertt::convert_computed_goto
 
 \*******************************************************************/
 
-void goto_convertt::convert_computed_goto(
+void goto_convertt::convert_gcc_computed_goto(
   const codet &code,
   goto_programt &dest)
 {
diff --git a/src/goto-programs/goto_convert_class.h b/src/goto-programs/goto_convert_class.h
index 61fa32fb1c..8d102d1beb 100644
--- a/src/goto-programs/goto_convert_class.h
+++ b/src/goto-programs/goto_convert_class.h
@@ -177,7 +177,7 @@ protected:
   void convert_ifthenelse(const code_ifthenelset &code, goto_programt &dest);
   void convert_init(const codet &code, goto_programt &dest);
   void convert_goto(const codet &code, goto_programt &dest);
-  void convert_computed_goto(const codet &code, goto_programt &dest);
+  void convert_gcc_computed_goto(const codet &code, goto_programt &dest);
   void convert_skip(const codet &code, goto_programt &dest);
   void convert_non_deterministic_goto(const codet &code, goto_programt &dest);
   void convert_label(const code_labelt &code, goto_programt &dest);