diff --git a/src/raster/undo.cpp b/src/raster/undo.cpp
index 14fc2f60e..a906af02a 100644
--- a/src/raster/undo.cpp
+++ b/src/raster/undo.cpp
@@ -1292,7 +1292,7 @@ static void chunk_move_layer_invert(UndoStream* stream, UndoChunkMoveLayer* chun
   Layer* after = (Layer*)GfxObj::find(chunk->after_id);
 
   if (folder == NULL || layer == NULL)
-    throw undo_exception("chunk_move_layer_invert");
+    throw UndoException("chunk_move_layer_invert");
 
   chunk_move_layer_new(stream, layer);
   folder->move_layer(layer, after);
@@ -1337,7 +1337,7 @@ static void chunk_set_layer_invert(UndoStream* stream, UndoChunkSetLayer* chunk,
   Layer* layer = (Layer* )GfxObj::find(chunk->layer_id);
 
   if (sprite == NULL)
-    throw undo_exception("chunk_set_layer_invert");
+    throw UndoException("chunk_set_layer_invert");
 
   chunk_set_layer_new(stream, sprite);
 
@@ -1383,7 +1383,7 @@ static void chunk_add_palette_invert(UndoStream* stream, UndoChunkAddPalette *ch
   Palette* palette = (Palette*)GfxObj::find(chunk->palette_id);
 
   if (sprite == NULL || palette == NULL)
-    throw undo_exception("chunk_add_palette_invert");
+    throw UndoException("chunk_add_palette_invert");
 
   chunk_remove_palette_new(stream, sprite, palette);
   sprite->deletePalette(palette);
@@ -1426,7 +1426,7 @@ static void chunk_remove_palette_invert(UndoStream* stream, UndoChunkRemovePalet
 {
   Sprite *sprite = (Sprite *)GfxObj::find(chunk->sprite_id);
   if (sprite == NULL)
-    throw undo_exception("chunk_remove_palette_invert");
+    throw UndoException("chunk_remove_palette_invert");
 
   Palette* palette = read_raw_palette(chunk->data);
 
@@ -1483,7 +1483,7 @@ static void chunk_remap_palette_invert(UndoStream* stream, UndoChunkRemapPalette
 {
   Sprite *sprite = (Sprite *)GfxObj::find(chunk->sprite_id);
   if (sprite == NULL)
-    throw undo_exception("chunk_remap_palette_invert");
+    throw UndoException("chunk_remap_palette_invert");
 
   // Inverse mapping
   std::vector<int> inverse_mapping(256);
diff --git a/src/raster/undo.h b/src/raster/undo.h
index 6a5bc2a84..2c9d0c437 100644
--- a/src/raster/undo.h
+++ b/src/raster/undo.h
@@ -36,10 +36,10 @@ class Stock;
 struct Dirty;
 struct UndoStream;
 
-class undo_exception : public ase_exception
+class UndoException : public ase_exception
 {
 public:
-  undo_exception(const char* msg) throw() : ase_exception(msg) { }
+  UndoException(const char* msg) throw() : ase_exception(msg) { }
 };
 
 class Undo : public GfxObj