diff --git a/src/core/color.cpp b/src/core/color.cpp
index 320799106..3d24ab9ea 100644
--- a/src/core/color.cpp
+++ b/src/core/color.cpp
@@ -640,14 +640,14 @@ int get_color_for_layer(Layer *layer, color_t color)
 {
   return
     fixup_color_for_layer(layer,
-			  get_color_for_image(layer->get_sprite()->imgtype,
+			  get_color_for_image(layer->getSprite()->imgtype,
 					      color));
 }
 
 int fixup_color_for_layer(Layer *layer, int color)
 {
   if (layer->is_background())
-    return fixup_color_for_background(layer->get_sprite()->imgtype, color);
+    return fixup_color_for_background(layer->getSprite()->imgtype, color);
   else
     return color;
 }
diff --git a/src/effect/images_ref.cpp b/src/effect/images_ref.cpp
index 7eb50c558..72e78fa1b 100644
--- a/src/effect/images_ref.cpp
+++ b/src/effect/images_ref.cpp
@@ -72,7 +72,7 @@ static ImageRef* images_ref_get_from_layer(Sprite* sprite, Layer* layer, int tar
   {								\
     ImageRef* image_ref = jnew(ImageRef, 1);			\
 								\
-    image_ref->image = layer->get_sprite()->stock->image[cel->image];	\
+    image_ref->image = layer->getSprite()->stock->image[cel->image];	\
     image_ref->layer = layer;					\
     image_ref->cel = cel;					\
     image_ref->next = NULL;					\
diff --git a/src/raster/layer.cpp b/src/raster/layer.cpp
index fcee0c9fa..58bac2ca7 100644
--- a/src/raster/layer.cpp
+++ b/src/raster/layer.cpp
@@ -128,9 +128,9 @@ LayerImage::LayerImage(LayerImage* src_layer, Sprite* dst_sprite)
       Cel* cel_copy = cel_new_copy(cel);
 
       assert((cel->image >= 0) &&
-	     (cel->image < src_layer->get_sprite()->stock->nimage));
+	     (cel->image < src_layer->getSprite()->stock->nimage));
 
-      Image* image = src_layer->get_sprite()->stock->image[cel->image];
+      Image* image = src_layer->getSprite()->stock->image[cel->image];
       assert(image != NULL);
 
       Image* image_copy = image_new_copy(image);
@@ -162,11 +162,11 @@ void LayerImage::destroy_all_cels()
     Cel* cel = *it;
 
     if (!cel_is_link(cel, this)) {
-      Image* image = get_sprite()->stock->image[cel->image];
+      Image* image = getSprite()->stock->image[cel->image];
 
       assert(image != NULL);
 
-      stock_remove_image(get_sprite()->stock, image);
+      stock_remove_image(getSprite()->stock, image);
       image_free(image);
     }
 
@@ -253,13 +253,13 @@ Cel* LayerImage::get_cel(int frame)
  */
 void LayerImage::configure_as_background()
 {
-  assert(get_sprite() != NULL);
-  assert(sprite_get_background_layer(get_sprite()) == NULL);
+  assert(getSprite() != NULL);
+  assert(sprite_get_background_layer(getSprite()) == NULL);
 
   *flags_addr() |= LAYER_IS_LOCKMOVE | LAYER_IS_BACKGROUND;
   set_name("Background");
 
-  get_sprite()->get_folder()->move_layer(this, NULL);
+  getSprite()->get_folder()->move_layer(this, NULL);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -377,12 +377,12 @@ Layer* layer_new_flatten_copy(Sprite* dst_sprite, const Layer* src_layer,
       /* does this frame have cels to render? */
       if (has_cels(src_layer, frame)) {
 	/* create a new image */
-	Image* image = image_new(flat_layer->get_sprite()->imgtype, w, h);
+	Image* image = image_new(flat_layer->getSprite()->imgtype, w, h);
 
 	try {
 	  /* create the new cel for the output layer (add the image to
 	     stock too) */
-	  Cel* cel = cel_new(frame, stock_add_image(flat_layer->get_sprite()->stock, image));
+	  Cel* cel = cel_new(frame, stock_add_image(flat_layer->getSprite()->stock, image));
 	  cel_set_position(cel, x, y);
 
 	  /* clear the image and render this frame */
@@ -418,9 +418,9 @@ void layer_render(const Layer* layer, Image* image, int x, int y, int frame)
 
       if (cel) {
 	assert((cel->image >= 0) &&
-	       (cel->image < layer->get_sprite()->stock->nimage));
+	       (cel->image < layer->getSprite()->stock->nimage));
 
-	src_image = layer->get_sprite()->stock->image[cel->image];
+	src_image = layer->getSprite()->stock->image[cel->image];
 	assert(src_image != NULL);
 
 	image_merge(image, src_image,
diff --git a/src/raster/layer.h b/src/raster/layer.h
index a3bf57615..7a16cb04e 100644
--- a/src/raster/layer.h
+++ b/src/raster/layer.h
@@ -56,7 +56,7 @@ public:
   std::string get_name() const { return m_name; }
   void set_name(const std::string& name) { m_name = name; }
 
-  Sprite* get_sprite() const { return m_sprite; }
+  Sprite* getSprite() const { return m_sprite; }
   LayerFolder* get_parent() const { return m_parent; }
   void set_parent(LayerFolder* folder) { m_parent = folder; }
   Layer* get_prev() const;
diff --git a/src/raster/undo.cpp b/src/raster/undo.cpp
index 9b25ae4b7..f12d8a65a 100644
--- a/src/raster/undo.cpp
+++ b/src/raster/undo.cpp
@@ -1994,7 +1994,7 @@ static Layer* read_raw_layer(ase_uint8* raw_data)
 	  Image* image = read_raw_image(raw_data);
 	  raw_data += get_raw_image_size(image);
 
-	  stock_replace_image(layer->get_sprite()->stock, cel->image, image);
+	  stock_replace_image(layer->getSprite()->stock, cel->image, image);
 	}
       }
       break;
@@ -2047,7 +2047,7 @@ static ase_uint8* write_raw_layer(ase_uint8* raw_data, Layer* layer)
 
   write_raw_uint8(*layer->flags_addr());	    /* flags */
   write_raw_uint16(layer->type);		    /* type */
-  write_raw_uint32(layer->get_sprite()->id);	    /* sprite */
+  write_raw_uint32(layer->getSprite()->id);	    /* sprite */
 
   switch (layer->type) {
 
@@ -2069,7 +2069,7 @@ static ase_uint8* write_raw_layer(ase_uint8* raw_data, Layer* layer)
 	  write_raw_uint8(0);
 	}
 	else {
-	  Image* image = layer->get_sprite()->stock->image[cel->image];
+	  Image* image = layer->getSprite()->stock->image[cel->image];
 	  assert(image != NULL);
 
 	  write_raw_uint8(1);
@@ -2114,7 +2114,7 @@ static int get_raw_layer_size(Layer* layer)
 	size += get_raw_cel_size(cel);
 	size++;			// has image?
 	if (!cel_is_link(cel, static_cast<LayerImage*>(layer))) {
-	  Image* image = layer->get_sprite()->stock->image[cel->image];
+	  Image* image = layer->getSprite()->stock->image[cel->image];
 	  size += get_raw_image_size(image);
 	}
       }
diff --git a/src/undoable.cpp b/src/undoable.cpp
index 1207c2da3..5ee885105 100644
--- a/src/undoable.cpp
+++ b/src/undoable.cpp
@@ -425,7 +425,7 @@ void Undoable::background_from_layer(LayerImage* layer, int bgcolor)
   assert(layer->is_image());
   assert(layer->is_readable());
   assert(layer->is_writable());
-  assert(layer->get_sprite() == m_sprite);
+  assert(layer->getSprite() == m_sprite);
   assert(sprite_get_background_layer(m_sprite) == NULL);
 
   // create a temporary image to draw each frame of the new
diff --git a/src/undoable.h b/src/undoable.h
index 032079df0..1c71d6b30 100644
--- a/src/undoable.h
+++ b/src/undoable.h
@@ -42,7 +42,7 @@ public:
   Undoable(SpriteWriter& sprite, const char* label);
   virtual ~Undoable();
 
-  inline Sprite* get_sprite() const { return m_sprite;  }
+  inline Sprite* getSprite() const { return m_sprite;  }
   inline bool is_enabled() const { return m_enabled_flag; }
 
   void commit();
diff --git a/src/util/render.cpp b/src/util/render.cpp
index ff840dd8b..ac88198ac 100644
--- a/src/util/render.cpp
+++ b/src/util/render.cpp
@@ -424,8 +424,8 @@ void RenderEngine::renderLayer(Sprite *sprite, Layer *layer, Image *image,
 	}
 	/* if not, we use the original cel-image from the images' stock */
 	else if ((cel->image >= 0) &&
-		 (cel->image < layer->get_sprite()->stock->nimage))
-	  src_image = layer->get_sprite()->stock->image[cel->image];
+		 (cel->image < layer->getSprite()->stock->nimage))
+	  src_image = layer->getSprite()->stock->image[cel->image];
 	else
 	  src_image = NULL;