diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index 415ca7eda..8125af8cc 100644
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -24,9 +24,9 @@
 
 /**
  * ClutterShaderEffect:
- * 
+ *
  * Base class for shader effects
- * 
+ *
  * #ClutterShaderEffect is a class that implements all the plumbing for
  * creating [class@Effect]s using GLSL shaders.
  *
@@ -305,11 +305,11 @@ clutter_shader_effect_create_shader (ClutterShaderEffect *self)
   switch (priv->shader_type)
     {
     case CLUTTER_FRAGMENT_SHADER:
-      return cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
+      return cogl_shader_new (COGL_SHADER_TYPE_FRAGMENT);
       break;
 
     case CLUTTER_VERTEX_SHADER:
-      return cogl_create_shader (COGL_SHADER_TYPE_VERTEX);
+      return cogl_shader_new (COGL_SHADER_TYPE_VERTEX);
       break;
 
     default:
@@ -349,7 +349,7 @@ clutter_shader_effect_try_static_source (ClutterShaderEffect *self)
 
           CLUTTER_NOTE (SHADER, "Compiling shader effect");
 
-          class_priv->program = cogl_create_program ();
+          class_priv->program = cogl_program_new ();
 
           cogl_program_attach_shader (class_priv->program,
                                       class_priv->shader);
@@ -873,7 +873,7 @@ clutter_shader_effect_set_shader_source (ClutterShaderEffect *effect,
 
   CLUTTER_NOTE (SHADER, "Compiling shader effect");
 
-  priv->program = cogl_create_program ();
+  priv->program = cogl_program_new ();
 
   cogl_program_attach_shader (priv->program, priv->shader);
 
diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h
index 0650687f8..c6cbb5eba 100644
--- a/cogl/cogl/cogl-pipeline-state.h
+++ b/cogl/cogl/cogl-pipeline-state.h
@@ -166,13 +166,13 @@ cogl_pipeline_get_alpha_test_reference (CoglPipeline *pipeline);
  * ```
  *
  * This is the list of source-names usable as blend factors:
- * 
+ *
  * - `SRC_COLOR`: The color of the incoming fragment
  * - `DST_COLOR`: The color of the framebuffer
  * - `CONSTANT`: The constant set via cogl_pipeline_set_blend_constant()
  *
  * These can also be used as factors:
- * 
+ *
  * - `0`: (0, 0, 0, 0)
  * - `1`: (1, 1, 1, 1)
  * - `SRC_ALPHA_SATURATE_FACTOR`: (f,f,f,1) where `f = MIN(SRC_COLOR[A],1-DST_COLOR[A])`
@@ -319,13 +319,13 @@ cogl_pipeline_get_user_program (CoglPipeline *pipeline);
  * CoglProgram *program;
  * CoglPipeline *pipeline;
  *
- * shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
+ * shader = cogl_shader_new (COGL_SHADER_TYPE_FRAGMENT);
  * cogl_shader_source (shader,
  *                     "!!ARBfp1.0\n"
  *                     "MOV result.color,fragment.color;\n"
  *                     "END\n");
  *
- * program = cogl_create_program ();
+ * program = cogl_program_new ();
  * cogl_program_attach_shader (program, shader);
  * cogl_program_link (program);
  *
diff --git a/cogl/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c
index 5d72a8bf7..93721abf5 100644
--- a/cogl/cogl/deprecated/cogl-program.c
+++ b/cogl/cogl/deprecated/cogl-program.c
@@ -86,7 +86,7 @@ cogl_program_class_init (CoglProgramClass *class)
    it. */
 
 CoglProgram*
-cogl_create_program (void)
+cogl_program_new (void)
 {
   CoglProgram *program;
 
diff --git a/cogl/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c
index 0cc43c623..4ea2220b5 100644
--- a/cogl/cogl/deprecated/cogl-shader.c
+++ b/cogl/cogl/deprecated/cogl-shader.c
@@ -70,7 +70,7 @@ cogl_shader_class_init (CoglShaderClass *class)
 }
 
 CoglShader*
-cogl_create_shader (CoglShaderType type)
+cogl_shader_new (CoglShaderType type)
 {
   CoglShader *shader;
 
@@ -81,7 +81,7 @@ cogl_create_shader (CoglShaderType type)
       break;
     default:
       g_warning ("Unexpected shader type (0x%08lX) given to "
-                 "cogl_create_shader", (unsigned long) type);
+                 "cogl_shader_new", (unsigned long) type);
       return NULL;
     }
 
diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h
index 487540352..118b1cc5d 100644
--- a/cogl/cogl/deprecated/cogl-shader.h
+++ b/cogl/cogl/deprecated/cogl-shader.h
@@ -145,7 +145,7 @@ typedef enum
 } CoglShaderType;
 
 /**
- * cogl_create_shader:
+ * cogl_shader_new:
  * @shader_type: COGL_SHADER_TYPE_VERTEX or COGL_SHADER_TYPE_FRAGMENT.
  *
  * Create a new shader handle, use cogl_shader_source() to set the
@@ -156,7 +156,7 @@ typedef enum
  */
 COGL_DEPRECATED_FOR (cogl_snippet_)
 COGL_EXPORT CoglShader*
-cogl_create_shader (CoglShaderType shader_type);
+cogl_shader_new (CoglShaderType shader_type);
 
 /**
  * cogl_shader_source:
@@ -165,7 +165,7 @@ cogl_create_shader (CoglShaderType shader_type);
  *
  * Replaces the current source associated with a shader with a new
  * one.
- * 
+ *
  * Deprecated: 1.16: Use #CoglSnippet api
  */
 COGL_DEPRECATED_FOR (cogl_snippet_)
@@ -188,7 +188,7 @@ COGL_EXPORT CoglShaderType
 cogl_shader_get_shader_type (CoglShader *self);
 
 /**
- * cogl_create_program:
+ * cogl_program_new:
  *
  * Create a new cogl program object that can be used to replace parts of the GL
  * rendering pipeline with custom code.
@@ -198,7 +198,7 @@ cogl_shader_get_shader_type (CoglShader *self);
  */
 COGL_DEPRECATED_FOR (cogl_snippet_)
 COGL_EXPORT CoglProgram*
-cogl_create_program (void);
+cogl_program_new (void);
 
 /**
  * cogl_program_attach_shader:
diff --git a/src/tests/clutter/interactive/test-cogl-shader-glsl.c b/src/tests/clutter/interactive/test-cogl-shader-glsl.c
index eb95bbae6..28d68c7e5 100644
--- a/src/tests/clutter/interactive/test-cogl-shader-glsl.c
+++ b/src/tests/clutter/interactive/test-cogl-shader-glsl.c
@@ -204,10 +204,10 @@ set_shader_num (int new_no)
 
   shader_pipeline = cogl_pipeline_new (ctx);
 
-  shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
+  shader = cogl_shader_new (COGL_SHADER_TYPE_FRAGMENT);
   cogl_shader_source (shader, shaders[new_no].source);
 
-  program = cogl_create_program ();
+  program = cogl_program_new ();
   cogl_program_attach_shader (program, shader);
   g_object_unref (shader);
   cogl_program_link (program);
@@ -358,4 +358,3 @@ test_cogl_shader_glsl_main (int argc, char *argv[])
 
   return EXIT_SUCCESS;
 }
-
diff --git a/src/tests/cogl/conform/test-just-vertex-shader.c b/src/tests/cogl/conform/test-just-vertex-shader.c
index f149b025b..cc5f5efbb 100644
--- a/src/tests/cogl/conform/test-just-vertex-shader.c
+++ b/src/tests/cogl/conform/test-just-vertex-shader.c
@@ -58,7 +58,7 @@ paint (TestState *state)
 
   /* Set up a dummy vertex shader that does nothing but the usual
      fixed function transform */
-  shader = cogl_create_shader (COGL_SHADER_TYPE_VERTEX);
+  shader = cogl_shader_new (COGL_SHADER_TYPE_VERTEX);
   cogl_shader_source (shader,
                       "void\n"
                       "main ()\n"
@@ -70,7 +70,7 @@ paint (TestState *state)
                       "  cogl_tex_coord_out[0] = cogl_tex_coord_in;\n"
                       "}\n");
 
-  program = cogl_create_program ();
+  program = cogl_program_new ();
   cogl_program_attach_shader (program, shader);
   cogl_program_link (program);
 
diff --git a/src/tests/cogl/conform/test-pipeline-uniforms.c b/src/tests/cogl/conform/test-pipeline-uniforms.c
index 75caf3585..566d101d2 100644
--- a/src/tests/cogl/conform/test-pipeline-uniforms.c
+++ b/src/tests/cogl/conform/test-pipeline-uniforms.c
@@ -94,10 +94,10 @@ create_pipeline_for_shader (TestState *state, const char *shader_source)
 
   pipeline = cogl_pipeline_new (test_ctx);
 
-  shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
+  shader = cogl_shader_new (COGL_SHADER_TYPE_FRAGMENT);
   cogl_shader_source (shader, shader_source);
 
-  program = cogl_create_program ();
+  program = cogl_program_new ();
   cogl_program_attach_shader (program, shader);
 
   cogl_pipeline_set_user_program (pipeline, program);