Renamed virtual function names.

(bzr r11608.1.57)

42 files changed, 366 insertions, 366 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index e58e186f6..b0704e23d 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -62,12 +62,12 @@ sp_feBlend_init(SPFeBlend *feBlend)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeBlend::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeBlend::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeBlend* object = this->spfeblend;
 
     SPFeBlend *blend = SP_FEBLEND(object);
 
-    CFilterPrimitive::onBuild(document, repr);
+    CFilterPrimitive::build(document, repr);
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
     object->readAttr( "mode" );
@@ -87,8 +87,8 @@ void CFeBlend::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeBlend::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeBlend::release() {
+	CFilterPrimitive::release();
 }
 
 static Inkscape::Filters::FilterBlendMode sp_feBlend_readmode(gchar const *value)
@@ -125,7 +125,7 @@ static Inkscape::Filters::FilterBlendMode sp_feBlend_readmode(gchar const *value
 /**
  * Sets a specific value in the SPFeBlend.
  */
-void CFeBlend::onSet(unsigned int key, gchar const *value) {
+void CFeBlend::set(unsigned int key, gchar const *value) {
 	SPFeBlend* object = this->spfeblend;
 
     SPFeBlend *feBlend = SP_FEBLEND(object);
@@ -150,7 +150,7 @@ void CFeBlend::onSet(unsigned int key, gchar const *value) {
             }
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -158,7 +158,7 @@ void CFeBlend::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeBlend::onUpdate(SPCtx *ctx, guint flags) {
+void CFeBlend::update(SPCtx *ctx, guint flags) {
 	SPFeBlend* object = this->spfeblend;
 
     SPFeBlend *blend = SP_FEBLEND(object);
@@ -180,13 +180,13 @@ void CFeBlend::onUpdate(SPCtx *ctx, guint flags) {
         object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, blend->in2));
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeBlend::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeBlend::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeBlend* object = this->spfeblend;
 
     SPFeBlend *blend = SP_FEBLEND(object);
@@ -227,12 +227,12 @@ Inkscape::XML::Node* CFeBlend::onWrite(Inkscape::XML::Document *doc, Inkscape::X
     }
     repr->setAttribute("mode", mode);
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeBlend::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeBlend::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeBlend* primitive = this->spfeblend;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/blend.h b/src/filters/blend.h
index 5ab56f4fd..cd0326eb4 100644
--- a/src/filters/blend.h
+++ b/src/filters/blend.h
@@ -41,16 +41,16 @@ public:
 	CFeBlend(SPFeBlend* blend);
 	virtual ~CFeBlend();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeBlend* spfeblend;
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index 356d50be7..d4e65bdc1 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -59,8 +59,8 @@ sp_feColorMatrix_init(SPFeColorMatrix *feColorMatrix)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeColorMatrix::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeColorMatrix::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 
 	SPFeColorMatrix* object = this->spfecolormatrix;
 
@@ -72,8 +72,8 @@ void CFeColorMatrix::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeColorMatrix::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeColorMatrix::release() {
+	CFilterPrimitive::release();
 }
 
 static Inkscape::Filters::FilterColorMatrixType sp_feColorMatrix_read_type(gchar const *value){
@@ -98,7 +98,7 @@ static Inkscape::Filters::FilterColorMatrixType sp_feColorMatrix_read_type(gchar
 /**
  * Sets a specific value in the SPFeColorMatrix.
  */
-void CFeColorMatrix::onSet(unsigned int key, gchar const *str) {
+void CFeColorMatrix::set(unsigned int key, gchar const *str) {
 	SPFeColorMatrix* object = this->spfecolormatrix;
 
     SPFeColorMatrix *feColorMatrix = SP_FECOLORMATRIX(object);
@@ -122,7 +122,7 @@ void CFeColorMatrix::onSet(unsigned int key, gchar const *str) {
             }
             break;
         default:
-        	CFilterPrimitive::onSet(key, str);
+        	CFilterPrimitive::set(key, str);
             break;
     }
 }
@@ -130,7 +130,7 @@ void CFeColorMatrix::onSet(unsigned int key, gchar const *str) {
 /**
  * Receives update notifications.
  */
-void CFeColorMatrix::onUpdate(SPCtx *ctx, guint flags) {
+void CFeColorMatrix::update(SPCtx *ctx, guint flags) {
 	SPFeColorMatrix* object = this->spfecolormatrix;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -140,13 +140,13 @@ void CFeColorMatrix::onUpdate(SPCtx *ctx, guint flags) {
 
     }
 
-	CFilterPrimitive::onUpdate(ctx, flags);
+	CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeColorMatrix::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeColorMatrix::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeColorMatrix* object = this->spfecolormatrix;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -155,12 +155,12 @@ Inkscape::XML::Node* CFeColorMatrix::onWrite(Inkscape::XML::Document *doc, Inksc
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeColorMatrix::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeColorMatrix::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeColorMatrix* primitive = this->spfecolormatrix;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/colormatrix.h b/src/filters/colormatrix.h
index eeb4db7ac..2ce1da06a 100644
--- a/src/filters/colormatrix.h
+++ b/src/filters/colormatrix.h
@@ -41,16 +41,16 @@ public:
 	CFeColorMatrix(SPFeColorMatrix* matrix);
 	virtual ~CFeColorMatrix();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeColorMatrix* spfecolormatrix;
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp
index 835c525c1..f1015eced 100644
--- a/src/filters/componenttransfer-funcnode.cpp
+++ b/src/filters/componenttransfer-funcnode.cpp
@@ -158,8 +158,8 @@ sp_fefuncnode_init(SPFeFuncNode *fefuncnode)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeFuncNode::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CObject::onBuild(document, repr);
+void CFeFuncNode::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CObject::build(document, repr);
 
 	SPFeFuncNode* object = this->spfefuncnode;
 
@@ -180,7 +180,7 @@ void CFeFuncNode::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeFuncNode::onRelease() {
+void CFeFuncNode::release() {
 	SPFeFuncNode* object = this->spfefuncnode;
     //SPFeFuncNode *fefuncnode = SP_FEFUNCNODE(object);
 
@@ -217,7 +217,7 @@ static Inkscape::Filters::FilterComponentTransferType sp_feComponenttransfer_rea
 /**
  * Sets a specific value in the SPFeFuncNode.
  */
-void CFeFuncNode::onSet(unsigned int key, gchar const *value) {
+void CFeFuncNode::set(unsigned int key, gchar const *value) {
 	SPFeFuncNode* object = this->spfefuncnode;
 
     SPFeFuncNode *feFuncNode = SP_FEFUNCNODE(object);
@@ -275,7 +275,7 @@ void CFeFuncNode::onSet(unsigned int key, gchar const *value) {
         default:
 //            if (((SPObjectClass *) feFuncNode_parent_class)->set)
 //                ((SPObjectClass *) feFuncNode_parent_class)->set(object, key, value);
-        	CObject::onSet(key, value);
+        	CObject::set(key, value);
             break;
     }
 }
@@ -283,7 +283,7 @@ void CFeFuncNode::onSet(unsigned int key, gchar const *value) {
 /**
  *  * Receives update notifications.
  *   */
-void CFeFuncNode::onUpdate(SPCtx *ctx, guint flags) {
+void CFeFuncNode::update(SPCtx *ctx, guint flags) {
 	SPFeFuncNode* object = this->spfefuncnode;
 
     SPFeFuncNode *feFuncNode = SP_FEFUNCNODE(object);
@@ -296,13 +296,13 @@ void CFeFuncNode::onUpdate(SPCtx *ctx, guint flags) {
         //object->readAttr( "elevation" );
     }
 
-    CObject::onUpdate(ctx, flags);
+    CObject::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeFuncNode::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeFuncNode::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeFuncNode* object = this->spfefuncnode;
     SPFeFuncNode *fefuncnode = SP_FEFUNCNODE(object);
 
@@ -319,7 +319,7 @@ TODO: I'm not sure what to do here...
     if (fefuncnode->elevation_set)
         sp_repr_set_css_double(repr, "elevation", fefuncnode->elevation);*/
 
-    CObject::onWrite(doc, repr, flags);
+    CObject::write(doc, repr, flags);
 
     return repr;
 }
diff --git a/src/filters/componenttransfer-funcnode.h b/src/filters/componenttransfer-funcnode.h
index 4b6fa423a..674074353 100644
--- a/src/filters/componenttransfer-funcnode.h
+++ b/src/filters/componenttransfer-funcnode.h
@@ -54,14 +54,14 @@ public:
 	CFeFuncNode(SPFeFuncNode* funcnode);
 	virtual ~CFeFuncNode();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
 private:
 	SPFeFuncNode* spfefuncnode;
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index 8b470dcff..d94198506 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -57,8 +57,8 @@ sp_feComponentTransfer_init(SPFeComponentTransfer *feComponentTransfer)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeComponentTransfer::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeComponentTransfer::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 
 	/*LOAD ATTRIBUTES FROM REPR HERE*/
 
@@ -102,12 +102,12 @@ static void sp_feComponentTransfer_children_modified(SPFeComponentTransfer *sp_c
 /**
  * Callback for child_added event.
  */
-void CFeComponentTransfer::onChildAdded(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
+void CFeComponentTransfer::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
 	SPFeComponentTransfer* object = this->spfecomponenttransfer;
 
     SPFeComponentTransfer *f = SP_FECOMPONENTTRANSFER(object);
 
-    CFilterPrimitive::onChildAdded(child, ref);
+    CFilterPrimitive::child_added(child, ref);
 
     sp_feComponentTransfer_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -116,12 +116,12 @@ void CFeComponentTransfer::onChildAdded(Inkscape::XML::Node *child, Inkscape::XM
 /**
  * Callback for remove_child event.
  */
-void CFeComponentTransfer::onRemoveChild(Inkscape::XML::Node *child) {
+void CFeComponentTransfer::remove_child(Inkscape::XML::Node *child) {
 	SPFeComponentTransfer* object = this->spfecomponenttransfer;
 
     SPFeComponentTransfer *f = SP_FECOMPONENTTRANSFER(object);
 
-    CFilterPrimitive::onRemoveChild(child);
+    CFilterPrimitive::remove_child(child);
 
     sp_feComponentTransfer_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -130,14 +130,14 @@ void CFeComponentTransfer::onRemoveChild(Inkscape::XML::Node *child) {
 /**
  * Drops any allocated memory.
  */
-void CFeComponentTransfer::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeComponentTransfer::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPFeComponentTransfer.
  */
-void CFeComponentTransfer::onSet(unsigned int key, gchar const *value) {
+void CFeComponentTransfer::set(unsigned int key, gchar const *value) {
 	SPFeComponentTransfer* object = this->spfecomponenttransfer;
 
     SPFeComponentTransfer *feComponentTransfer = SP_FECOMPONENTTRANSFER(object);
@@ -146,7 +146,7 @@ void CFeComponentTransfer::onSet(unsigned int key, gchar const *value) {
     switch(key) {
         /*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -154,7 +154,7 @@ void CFeComponentTransfer::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeComponentTransfer::onUpdate(SPCtx *ctx, guint flags) {
+void CFeComponentTransfer::update(SPCtx *ctx, guint flags) {
 	SPFeComponentTransfer* object = this->spfecomponenttransfer;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -164,13 +164,13 @@ void CFeComponentTransfer::onUpdate(SPCtx *ctx, guint flags) {
 
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeComponentTransfer::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeComponentTransfer::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeComponentTransfer* object = this->spfecomponenttransfer;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -179,12 +179,12 @@ Inkscape::XML::Node* CFeComponentTransfer::onWrite(Inkscape::XML::Document *doc,
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeComponentTransfer::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeComponentTransfer::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeComponentTransfer* primitive = this->spfecomponenttransfer;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/componenttransfer.h b/src/filters/componenttransfer.h
index 823b85bdd..e46f228bc 100644
--- a/src/filters/componenttransfer.h
+++ b/src/filters/componenttransfer.h
@@ -42,19 +42,19 @@ public:
 	CFeComponentTransfer(SPFeComponentTransfer* tr);
 	virtual ~CFeComponentTransfer();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onChildAdded(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
-	virtual void onRemoveChild(Inkscape::XML::Node* child);
+	virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
+	virtual void remove_child(Inkscape::XML::Node* child);
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeComponentTransfer* spfecomponenttransfer;
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index d1769f649..1d065da77 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -62,10 +62,10 @@ sp_feComposite_init(SPFeComposite *feComposite)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeComposite::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeComposite::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeComposite* object = this->spfecomposite;
 
-	CFilterPrimitive::onBuild(document, repr);
+	CFilterPrimitive::build(document, repr);
 
 	SPFeComposite *comp = SP_FECOMPOSITE(object);
 
@@ -92,8 +92,8 @@ void CFeComposite::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeComposite::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeComposite::release() {
+	CFilterPrimitive::release();
 }
 
 static FeCompositeOperator
@@ -112,7 +112,7 @@ sp_feComposite_read_operator(gchar const *value) {
 /**
  * Sets a specific value in the SPFeComposite.
  */
-void CFeComposite::onSet(unsigned int key, gchar const *value) {
+void CFeComposite::set(unsigned int key, gchar const *value) {
 	SPFeComposite* object = this->spfecomposite;
 
     SPFeComposite *feComposite = SP_FECOMPOSITE(object);
@@ -176,7 +176,7 @@ void CFeComposite::onSet(unsigned int key, gchar const *value) {
             break;
 
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -185,7 +185,7 @@ void CFeComposite::onSet(unsigned int key, gchar const *value) {
  * Receives update notifications.
  */
 void
-CFeComposite::onUpdate(SPCtx *ctx, guint flags) {
+CFeComposite::update(SPCtx *ctx, guint flags) {
 	SPFeComposite* object = this->spfecomposite;
 
     SPFeComposite *comp = SP_FECOMPOSITE(object);
@@ -209,13 +209,13 @@ CFeComposite::onUpdate(SPCtx *ctx, guint flags) {
         object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, comp->in2));
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeComposite::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeComposite::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeComposite* object = this->spfecomposite;
 
     SPFeComposite *comp = SP_FECOMPOSITE(object);
@@ -270,12 +270,12 @@ Inkscape::XML::Node* CFeComposite::onWrite(Inkscape::XML::Document *doc, Inkscap
         repr->setAttribute("k4", 0);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeComposite::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeComposite::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeComposite* primitive = this->spfecomposite;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/composite.h b/src/filters/composite.h
index 263580d9b..780e84e20 100644
--- a/src/filters/composite.h
+++ b/src/filters/composite.h
@@ -52,16 +52,16 @@ public:
 	CFeComposite(SPFeComposite* comp);
 	virtual ~CFeComposite();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeComposite* spfecomposite;
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 09099d43d..a25c4621e 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -70,8 +70,8 @@ sp_feConvolveMatrix_init(SPFeConvolveMatrix *feConvolveMatrix)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeConvolveMatrix::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeConvolveMatrix::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 
 	SPFeConvolveMatrix* object = this->spfeconvolvematrix;
 
@@ -90,8 +90,8 @@ void CFeConvolveMatrix::onBuild(SPDocument *document, Inkscape::XML::Node *repr)
 /**
  * Drops any allocated memory.
  */
-void CFeConvolveMatrix::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeConvolveMatrix::release() {
+	CFilterPrimitive::release();
 }
 
 static Inkscape::Filters::FilterConvolveMatrixEdgeMode sp_feConvolveMatrix_read_edgeMode(gchar const *value){
@@ -113,7 +113,7 @@ static Inkscape::Filters::FilterConvolveMatrixEdgeMode sp_feConvolveMatrix_read_
 /**
  * Sets a specific value in the SPFeConvolveMatrix.
  */
-void CFeConvolveMatrix::onSet(unsigned int key, gchar const *value) {
+void CFeConvolveMatrix::set(unsigned int key, gchar const *value) {
 	SPFeConvolveMatrix* object = this->spfeconvolvematrix;
 
     SPFeConvolveMatrix *feConvolveMatrix = SP_FECONVOLVEMATRIX(object);
@@ -229,7 +229,7 @@ void CFeConvolveMatrix::onSet(unsigned int key, gchar const *value) {
             }
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 
@@ -238,7 +238,7 @@ void CFeConvolveMatrix::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeConvolveMatrix::onUpdate(SPCtx *ctx, guint flags) {
+void CFeConvolveMatrix::update(SPCtx *ctx, guint flags) {
 	SPFeConvolveMatrix* object = this->spfeconvolvematrix;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -248,13 +248,13 @@ void CFeConvolveMatrix::onUpdate(SPCtx *ctx, guint flags) {
 
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeConvolveMatrix::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeConvolveMatrix::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeConvolveMatrix* object = this->spfeconvolvematrix;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -264,12 +264,12 @@ Inkscape::XML::Node* CFeConvolveMatrix::onWrite(Inkscape::XML::Document *doc, In
     }
 
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeConvolveMatrix::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeConvolveMatrix::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeConvolveMatrix* primitive = this->spfeconvolvematrix;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/convolvematrix.h b/src/filters/convolvematrix.h
index 7513fcd40..6b00bb9e2 100644
--- a/src/filters/convolvematrix.h
+++ b/src/filters/convolvematrix.h
@@ -53,16 +53,16 @@ public:
 	CFeConvolveMatrix(SPFeConvolveMatrix* matrix);
 	virtual ~CFeConvolveMatrix();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeConvolveMatrix* spfeconvolvematrix;
diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp
index c6c476efb..621c36e1a 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -77,8 +77,8 @@ sp_feDiffuseLighting_init(SPFeDiffuseLighting *feDiffuseLighting)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeDiffuseLighting::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeDiffuseLighting::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 
 	SPFeDiffuseLighting* object = this->spfediffuselighting;
 
@@ -92,14 +92,14 @@ void CFeDiffuseLighting::onBuild(SPDocument *document, Inkscape::XML::Node *repr
 /**
  * Drops any allocated memory.
  */
-void CFeDiffuseLighting::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeDiffuseLighting::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPFeDiffuseLighting.
  */
-void CFeDiffuseLighting::onSet(unsigned int key, gchar const *value) {
+void CFeDiffuseLighting::set(unsigned int key, gchar const *value) {
 	SPFeDiffuseLighting* object = this->spfediffuselighting;
 
     SPFeDiffuseLighting *feDiffuseLighting = SP_FEDIFFUSELIGHTING(object);
@@ -181,7 +181,7 @@ void CFeDiffuseLighting::onSet(unsigned int key, gchar const *value) {
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -189,7 +189,7 @@ void CFeDiffuseLighting::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeDiffuseLighting::onUpdate(SPCtx *ctx, guint flags) {
+void CFeDiffuseLighting::update(SPCtx *ctx, guint flags) {
 	SPFeDiffuseLighting* object = this->spfediffuselighting;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG)) {
@@ -199,13 +199,13 @@ void CFeDiffuseLighting::onUpdate(SPCtx *ctx, guint flags) {
         object->readAttr( "lighting-color" );
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeDiffuseLighting::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeDiffuseLighting::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeDiffuseLighting* object = this->spfediffuselighting;
 
     SPFeDiffuseLighting *fediffuselighting = SP_FEDIFFUSELIGHTING(object);
@@ -233,7 +233,7 @@ Inkscape::XML::Node* CFeDiffuseLighting::onWrite(Inkscape::XML::Document *doc, I
     } else
         repr->setAttribute("lighting-color", NULL);
         
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
@@ -241,12 +241,12 @@ Inkscape::XML::Node* CFeDiffuseLighting::onWrite(Inkscape::XML::Document *doc, I
 /**
  * Callback for child_added event.
  */
-void CFeDiffuseLighting::onChildAdded(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
+void CFeDiffuseLighting::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
 	SPFeDiffuseLighting* object = this->spfediffuselighting;
 
     SPFeDiffuseLighting *f = SP_FEDIFFUSELIGHTING(object);
 
-    CFilterPrimitive::onChildAdded(child, ref);
+    CFilterPrimitive::child_added(child, ref);
 
     sp_feDiffuseLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -255,22 +255,22 @@ void CFeDiffuseLighting::onChildAdded(Inkscape::XML::Node *child, Inkscape::XML:
 /**
  * Callback for remove_child event.
  */
-void CFeDiffuseLighting::onRemoveChild(Inkscape::XML::Node *child) {
+void CFeDiffuseLighting::remove_child(Inkscape::XML::Node *child) {
 	SPFeDiffuseLighting* object = this->spfediffuselighting;
 
 	SPFeDiffuseLighting *f = SP_FEDIFFUSELIGHTING(object);
 
-	CFilterPrimitive::onRemoveChild(child);
+	CFilterPrimitive::remove_child(child);
 
 	sp_feDiffuseLighting_children_modified(f);
 	object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
 }
 
-void CFeDiffuseLighting::onOrderChanged(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) {
+void CFeDiffuseLighting::order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) {
 	SPFeDiffuseLighting* object = this->spfediffuselighting;
 
     SPFeDiffuseLighting *f = SP_FEDIFFUSELIGHTING(object);
-    CFilterPrimitive::onOrderChanged(child, old_ref, new_ref);
+    CFilterPrimitive::order_changed(child, old_ref, new_ref);
 
     sp_feDiffuseLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -295,7 +295,7 @@ static void sp_feDiffuseLighting_children_modified(SPFeDiffuseLighting *sp_diffu
    }
 }
 
-void CFeDiffuseLighting::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeDiffuseLighting::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeDiffuseLighting* primitive = this->spfediffuselighting;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/diffuselighting.h b/src/filters/diffuselighting.h
index c4dc78e71..3bfe7e4f5 100644
--- a/src/filters/diffuselighting.h
+++ b/src/filters/diffuselighting.h
@@ -54,21 +54,21 @@ public:
 	CFeDiffuseLighting(SPFeDiffuseLighting* dl);
 	virtual ~CFeDiffuseLighting();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onChildAdded(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
-	virtual void onRemoveChild(Inkscape::XML::Node* child);
+	virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
+	virtual void remove_child(Inkscape::XML::Node* child);
 
-	virtual void onOrderChanged(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr);
+	virtual void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr);
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeDiffuseLighting* spfediffuselighting;
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index 6fdbbf79c..1f82efcef 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -60,10 +60,10 @@ sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeDisplacementMap::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeDisplacementMap::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeDisplacementMap* object = this->spfedisplacementmap;
 
-	CFilterPrimitive::onBuild(document, repr);
+	CFilterPrimitive::build(document, repr);
 
 	/*LOAD ATTRIBUTES FROM REPR HERE*/
 	object->readAttr( "scale" );
@@ -86,8 +86,8 @@ void CFeDisplacementMap::onBuild(SPDocument *document, Inkscape::XML::Node *repr
 /**
  * Drops any allocated memory.
  */
-void CFeDisplacementMap::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeDisplacementMap::release() {
+	CFilterPrimitive::release();
 }
 
 static FilterDisplacementMapChannelSelector sp_feDisplacementMap_readChannelSelector(gchar const *value)
@@ -117,7 +117,7 @@ static FilterDisplacementMapChannelSelector sp_feDisplacementMap_readChannelSele
 /**
  * Sets a specific value in the SPFeDisplacementMap.
  */
-void CFeDisplacementMap::onSet(unsigned int key, gchar const *value) {
+void CFeDisplacementMap::set(unsigned int key, gchar const *value) {
 	SPFeDisplacementMap* object = this->spfedisplacementmap;
 
     SPFeDisplacementMap *feDisplacementMap = SP_FEDISPLACEMENTMAP(object);
@@ -156,7 +156,7 @@ void CFeDisplacementMap::onSet(unsigned int key, gchar const *value) {
             }
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -164,7 +164,7 @@ void CFeDisplacementMap::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeDisplacementMap::onUpdate(SPCtx *ctx, guint flags) {
+void CFeDisplacementMap::update(SPCtx *ctx, guint flags) {
 	SPFeDisplacementMap* object = this->spfedisplacementmap;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -187,7 +187,7 @@ void CFeDisplacementMap::onUpdate(SPCtx *ctx, guint flags) {
         object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, disp->in2));
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 static char const * get_channelselector_name(FilterDisplacementMapChannelSelector selector) {
@@ -208,7 +208,7 @@ static char const * get_channelselector_name(FilterDisplacementMapChannelSelecto
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeDisplacementMap::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeDisplacementMap::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeDisplacementMap* object = this->spfedisplacementmap;
 
     SPFeDisplacementMap *disp = SP_FEDISPLACEMENTMAP(object);
@@ -238,12 +238,12 @@ Inkscape::XML::Node* CFeDisplacementMap::onWrite(Inkscape::XML::Document *doc, I
     repr->setAttribute("yChannelSelector",
                        get_channelselector_name(disp->yChannelSelector));
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeDisplacementMap::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeDisplacementMap::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeDisplacementMap* primitive = this->spfedisplacementmap;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/displacementmap.h b/src/filters/displacementmap.h
index 609142dc0..a2eac1ecf 100644
--- a/src/filters/displacementmap.h
+++ b/src/filters/displacementmap.h
@@ -49,16 +49,16 @@ public:
 	CFeDisplacementMap(SPFeDisplacementMap* map);
 	virtual ~CFeDisplacementMap();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeDisplacementMap* spfedisplacementmap;
diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp
index b8cf632a1..30cbb03fe 100644
--- a/src/filters/distantlight.cpp
+++ b/src/filters/distantlight.cpp
@@ -62,8 +62,8 @@ sp_fedistantlight_init(SPFeDistantLight *fedistantlight)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeDistantLight::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CObject::onBuild(document, repr);
+void CFeDistantLight::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CObject::build(document, repr);
 
 	SPFeDistantLight* object = this->spfedistantlight;
 
@@ -78,7 +78,7 @@ void CFeDistantLight::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeDistantLight::onRelease() {
+void CFeDistantLight::release() {
 	SPFeDistantLight* object = this->spfedistantlight;
 
     //SPFeDistantLight *fedistantlight = SP_FEDISTANTLIGHT(object);
@@ -94,7 +94,7 @@ void CFeDistantLight::onRelease() {
 /**
  * Sets a specific value in the SPFeDistantLight.
  */
-void CFeDistantLight::onSet(unsigned int key, gchar const *value) {
+void CFeDistantLight::set(unsigned int key, gchar const *value) {
 	SPFeDistantLight* object = this->spfedistantlight;
     SPFeDistantLight *fedistantlight = SP_FEDISTANTLIGHT(object);
     gchar *end_ptr;
@@ -137,7 +137,7 @@ void CFeDistantLight::onSet(unsigned int key, gchar const *value) {
         break;
     default:
         // See if any parents need this value.
-    	CObject::onSet(key, value);
+    	CObject::set(key, value);
         break;
     }
 }
@@ -145,7 +145,7 @@ void CFeDistantLight::onSet(unsigned int key, gchar const *value) {
 /**
  *  * Receives update notifications.
  *   */
-void CFeDistantLight::onUpdate(SPCtx *ctx, guint flags) {
+void CFeDistantLight::update(SPCtx *ctx, guint flags) {
 	SPFeDistantLight* object = this->spfedistantlight;
     SPFeDistantLight *feDistantLight = SP_FEDISTANTLIGHT(object);
     (void)feDistantLight;
@@ -156,13 +156,13 @@ void CFeDistantLight::onUpdate(SPCtx *ctx, guint flags) {
         object->readAttr( "elevation" );
     }
 
-    CObject::onUpdate(ctx, flags);
+    CObject::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeDistantLight::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeDistantLight::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeDistantLight* object = this->spfedistantlight;
     SPFeDistantLight *fedistantlight = SP_FEDISTANTLIGHT(object);
 
@@ -175,7 +175,7 @@ Inkscape::XML::Node* CFeDistantLight::onWrite(Inkscape::XML::Document *doc, Inks
     if (fedistantlight->elevation_set)
         sp_repr_set_css_double(repr, "elevation", fedistantlight->elevation);
 
-    CObject::onWrite(doc, repr, flags);
+    CObject::write(doc, repr, flags);
 
     return repr;
 }
diff --git a/src/filters/distantlight.h b/src/filters/distantlight.h
index 78de7e8cf..e0fa3b1c2 100644
--- a/src/filters/distantlight.h
+++ b/src/filters/distantlight.h
@@ -44,14 +44,14 @@ public:
 	CFeDistantLight(SPFeDistantLight* distantlight);
 	virtual ~CFeDistantLight();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
 private:
 	SPFeDistantLight* spfedistantlight;
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index 8400e7e21..7c780b5ca 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -58,8 +58,8 @@ static void sp_feFlood_init(SPFeFlood *feFlood)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeFlood::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeFlood::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 
 	SPFeFlood* object = this->spfeflood;
 
@@ -71,14 +71,14 @@ void CFeFlood::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeFlood::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeFlood::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPFeFlood.
  */
-void CFeFlood::onSet(unsigned int key, gchar const *value) {
+void CFeFlood::set(unsigned int key, gchar const *value) {
 	SPFeFlood* object = this->spfeflood;
 
     SPFeFlood *feFlood = SP_FEFLOOD(object);
@@ -137,7 +137,7 @@ void CFeFlood::onSet(unsigned int key, gchar const *value) {
             }
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -145,7 +145,7 @@ void CFeFlood::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeFlood::onUpdate(SPCtx *ctx, guint flags) {
+void CFeFlood::update(SPCtx *ctx, guint flags) {
 	SPFeFlood* object = this->spfeflood;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -155,13 +155,13 @@ void CFeFlood::onUpdate(SPCtx *ctx, guint flags) {
 
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeFlood::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeFlood::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeFlood* object = this->spfeflood;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -170,12 +170,12 @@ Inkscape::XML::Node* CFeFlood::onWrite(Inkscape::XML::Document *doc, Inkscape::X
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeFlood::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeFlood::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeFlood* primitive = this->spfeflood;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/flood.h b/src/filters/flood.h
index 60d1aae41..24231f992 100644
--- a/src/filters/flood.h
+++ b/src/filters/flood.h
@@ -46,16 +46,16 @@ public:
 	CFeFlood(SPFeFlood* flood);
 	virtual ~CFeFlood();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeFlood* spfeflood;
diff --git a/src/filters/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp
index 3a35a3598..90bdb4780 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/filters/gaussian-blur.cpp
@@ -60,8 +60,8 @@ sp_gaussianBlur_init(SPGaussianBlur *gaussianBlur)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CGaussianBlur::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CGaussianBlur::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 
 	SPGaussianBlur* object = this->spgaussianblur;
 
@@ -71,14 +71,14 @@ void CGaussianBlur::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CGaussianBlur::onRelease() {
-	CFilterPrimitive::onRelease();
+void CGaussianBlur::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPGaussianBlur.
  */
-void CGaussianBlur::onSet(unsigned int key, gchar const *value) {
+void CGaussianBlur::set(unsigned int key, gchar const *value) {
 	SPGaussianBlur* object = this->spgaussianblur;
 
     SPGaussianBlur *gaussianBlur = SP_GAUSSIANBLUR(object);
@@ -89,7 +89,7 @@ void CGaussianBlur::onSet(unsigned int key, gchar const *value) {
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -97,20 +97,20 @@ void CGaussianBlur::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CGaussianBlur::onUpdate(SPCtx *ctx, guint flags) {
+void CGaussianBlur::update(SPCtx *ctx, guint flags) {
 	SPGaussianBlur* object = this->spgaussianblur;
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         object->readAttr( "stdDeviation" );
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CGaussianBlur::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CGaussianBlur::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPGaussianBlur* object = this->spgaussianblur;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -119,7 +119,7 @@ Inkscape::XML::Node* CGaussianBlur::onWrite(Inkscape::XML::Document *doc, Inksca
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
@@ -134,7 +134,7 @@ void  sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num, float optnum
     blur->stdDeviation.setOptNumber(optnum);
 }
 
-void CGaussianBlur::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CGaussianBlur::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPGaussianBlur* primitive = this->spgaussianblur;
 
     SPGaussianBlur *sp_blur = SP_GAUSSIANBLUR(primitive);
diff --git a/src/filters/gaussian-blur.h b/src/filters/gaussian-blur.h
index 7efad6b8a..2872f0cc3 100644
--- a/src/filters/gaussian-blur.h
+++ b/src/filters/gaussian-blur.h
@@ -41,16 +41,16 @@ public:
 	CGaussianBlur(SPGaussianBlur* gb);
 	virtual ~CGaussianBlur();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPGaussianBlur* spgaussianblur;
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index 396d17a65..aeae90471 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -60,14 +60,14 @@ static void sp_feImage_init(SPFeImage *feImage)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeImage::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeImage::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeImage* object = this->spfeimage;
 
     // Save document reference so we can load images with relative paths.
     SPFeImage *feImage = SP_FEIMAGE(object);
     feImage->document = document;
 
-    CFilterPrimitive::onBuild(document, repr);
+    CFilterPrimitive::build(document, repr);
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
 
@@ -78,7 +78,7 @@ void CFeImage::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeImage::onRelease() {
+void CFeImage::release() {
 	SPFeImage* object = this->spfeimage;
 
     SPFeImage *feImage = SP_FEIMAGE(object);
@@ -86,7 +86,7 @@ void CFeImage::onRelease() {
     feImage->_href_modified_connection.disconnect();
     if (feImage->SVGElemRef) delete feImage->SVGElemRef;
 
-    CFilterPrimitive::onRelease();
+    CFilterPrimitive::release();
 }
 
 static void sp_feImage_elem_modified(SPObject* /*href*/, guint /*flags*/, SPObject* obj)
@@ -111,7 +111,7 @@ static void sp_feImage_href_modified(SPObject* /*old_elem*/, SPObject* new_elem,
 /**
  * Sets a specific value in the SPFeImage.
  */
-void CFeImage::onSet(unsigned int key, gchar const *value) {
+void CFeImage::set(unsigned int key, gchar const *value) {
 	SPFeImage* object = this->spfeimage;
 
     SPFeImage *feImage = SP_FEIMAGE(object);
@@ -216,7 +216,7 @@ void CFeImage::onSet(unsigned int key, gchar const *value) {
             break;
 
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -224,7 +224,7 @@ void CFeImage::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeImage::onUpdate(SPCtx *ctx, guint flags) {
+void CFeImage::update(SPCtx *ctx, guint flags) {
 	SPFeImage* object = this->spfeimage;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -233,13 +233,13 @@ void CFeImage::onUpdate(SPCtx *ctx, guint flags) {
         /* do something to trigger redisplay, updates? */
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeImage::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeImage::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeImage* object = this->spfeimage;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -248,12 +248,12 @@ Inkscape::XML::Node* CFeImage::onWrite(Inkscape::XML::Document *doc, Inkscape::X
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeImage::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeImage::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeImage* primitive = this->spfeimage;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/image.h b/src/filters/image.h
index 312c646b7..0144082fa 100644
--- a/src/filters/image.h
+++ b/src/filters/image.h
@@ -53,16 +53,16 @@ public:
 	CFeImage(SPFeImage* image);
 	virtual ~CFeImage();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeImage* spfeimage;
diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp
index 897003445..b3e87f1a4 100644
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
@@ -54,21 +54,21 @@ sp_feMerge_init(SPFeMerge *feMerge)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeMerge::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeMerge::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 }
 
 /**
  * Drops any allocated memory.
  */
-void CFeMerge::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeMerge::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPFeMerge.
  */
-void CFeMerge::onSet(unsigned int key, gchar const *value) {
+void CFeMerge::set(unsigned int key, gchar const *value) {
 	SPFeMerge* object = this->spfemerge;
 
     SPFeMerge *feMerge = SP_FEMERGE(object);
@@ -77,7 +77,7 @@ void CFeMerge::onSet(unsigned int key, gchar const *value) {
     switch(key) {
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -85,20 +85,20 @@ void CFeMerge::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeMerge::onUpdate(SPCtx *ctx, guint flags) {
+void CFeMerge::update(SPCtx *ctx, guint flags) {
 	SPFeMerge* object = this->spfemerge;
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeMerge::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeMerge::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeMerge* object = this->spfemerge;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -108,12 +108,12 @@ Inkscape::XML::Node* CFeMerge::onWrite(Inkscape::XML::Document *doc, Inkscape::X
     }
 
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeMerge::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeMerge::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeMerge* primitive = this->spfemerge;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/merge.h b/src/filters/merge.h
index c3bbadb72..9b30a7a05 100644
--- a/src/filters/merge.h
+++ b/src/filters/merge.h
@@ -34,16 +34,16 @@ public:
 	CFeMerge(SPFeMerge* merge);
 	virtual ~CFeMerge();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeMerge* spfemerge;
diff --git a/src/filters/mergenode.cpp b/src/filters/mergenode.cpp
index 8e5b4d157..4f9524c91 100644
--- a/src/filters/mergenode.cpp
+++ b/src/filters/mergenode.cpp
@@ -53,7 +53,7 @@ sp_feMergeNode_init(SPFeMergeNode *feMergeNode)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeMergeNode::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeMergeNode::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeMergeNode* object = this->spfemergenode;
 	object->readAttr( "in" );
 }
@@ -61,14 +61,14 @@ void CFeMergeNode::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeMergeNode::onRelease() {
-	CObject::onRelease();
+void CFeMergeNode::release() {
+	CObject::release();
 }
 
 /**
  * Sets a specific value in the SPFeMergeNode.
  */
-void CFeMergeNode::onSet(unsigned int key, gchar const *value) {
+void CFeMergeNode::set(unsigned int key, gchar const *value) {
 	SPFeMergeNode* object = this->spfemergenode;
     SPFeMergeNode *feMergeNode = SP_FEMERGENODE(object);
     SPFeMerge *parent = SP_FEMERGE(object->parent);
@@ -82,13 +82,13 @@ void CFeMergeNode::onSet(unsigned int key, gchar const *value) {
     }
 
     /* See if any parents need this value. */
-    CObject::onSet(key, value);
+    CObject::set(key, value);
 }
 
 /**
  * Receives update notifications.
  */
-void CFeMergeNode::onUpdate(SPCtx *ctx, guint flags) {
+void CFeMergeNode::update(SPCtx *ctx, guint flags) {
 	SPFeMergeNode* object = this->spfemergenode;
     //SPFeMergeNode *feMergeNode = SP_FEMERGENODE(object);
 
@@ -96,13 +96,13 @@ void CFeMergeNode::onUpdate(SPCtx *ctx, guint flags) {
         object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
     }
 
-    CObject::onUpdate(ctx, flags);
+    CObject::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeMergeNode::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeMergeNode::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeMergeNode* object = this->spfemergenode;
     //SPFeMergeNode *feMergeNode = SP_FEMERGENODE(object);
 
@@ -116,7 +116,7 @@ Inkscape::XML::Node* CFeMergeNode::onWrite(Inkscape::XML::Document *doc, Inkscap
         }
     }
 
-    CObject::onWrite(doc, repr, flags);
+    CObject::write(doc, repr, flags);
 
     return repr;
 }
diff --git a/src/filters/mergenode.h b/src/filters/mergenode.h
index ad3610ea5..897df31be 100644
--- a/src/filters/mergenode.h
+++ b/src/filters/mergenode.h
@@ -35,14 +35,14 @@ public:
 	CFeMergeNode(SPFeMergeNode* mergenode);
 	virtual ~CFeMergeNode();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
 private:
 	SPFeMergeNode* spfemergenode;
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index a067b7ed3..fb58b5fcf 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -59,8 +59,8 @@ sp_feMorphology_init(SPFeMorphology *feMorphology)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeMorphology::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeMorphology::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 
 	SPFeMorphology* object = this->spfemorphology;
 
@@ -72,8 +72,8 @@ void CFeMorphology::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeMorphology::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeMorphology::release() {
+	CFilterPrimitive::release();
 }
 
 static Inkscape::Filters::FilterMorphologyOperator sp_feMorphology_read_operator(gchar const *value){
@@ -92,7 +92,7 @@ static Inkscape::Filters::FilterMorphologyOperator sp_feMorphology_read_operator
 /**
  * Sets a specific value in the SPFeMorphology.
  */
-void CFeMorphology::onSet(unsigned int key, gchar const *value) {
+void CFeMorphology::set(unsigned int key, gchar const *value) {
 	SPFeMorphology* object = this->spfemorphology;
 
     SPFeMorphology *feMorphology = SP_FEMORPHOLOGY(object);
@@ -116,7 +116,7 @@ void CFeMorphology::onSet(unsigned int key, gchar const *value) {
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 
@@ -125,7 +125,7 @@ void CFeMorphology::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeMorphology::onUpdate(SPCtx *ctx, guint flags) {
+void CFeMorphology::update(SPCtx *ctx, guint flags) {
 	SPFeMorphology* object = this->spfemorphology;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -135,13 +135,13 @@ void CFeMorphology::onUpdate(SPCtx *ctx, guint flags) {
 
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeMorphology::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeMorphology::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeMorphology* object = this->spfemorphology;
 
 	/* TODO: Don't just clone, but create a new repr node and write all
@@ -150,12 +150,12 @@ Inkscape::XML::Node* CFeMorphology::onWrite(Inkscape::XML::Document *doc, Inksca
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeMorphology::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeMorphology::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeMorphology* primitive = this->spfemorphology;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/morphology.h b/src/filters/morphology.h
index add753424..3ef629ef4 100644
--- a/src/filters/morphology.h
+++ b/src/filters/morphology.h
@@ -41,16 +41,16 @@ public:
 	CFeMorphology(SPFeMorphology* morph);
 	virtual ~CFeMorphology();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeMorphology* spfemorphology;
diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp
index 16fad1176..cc1eb42fa 100644
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
@@ -58,10 +58,10 @@ sp_feOffset_init(SPFeOffset *feOffset)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeOffset::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeOffset::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeOffset* object = this->spfeoffset;
 
-	CFilterPrimitive::onBuild(document, repr);
+	CFilterPrimitive::build(document, repr);
 
 	object->readAttr( "dx" );
 	object->readAttr( "dy" );
@@ -70,14 +70,14 @@ void CFeOffset::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeOffset::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeOffset::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPFeOffset.
  */
-void CFeOffset::onSet(unsigned int key, gchar const *value) {
+void CFeOffset::set(unsigned int key, gchar const *value) {
 	SPFeOffset* object = this->spfeoffset;
 
     SPFeOffset *feOffset = SP_FEOFFSET(object);
@@ -101,7 +101,7 @@ void CFeOffset::onSet(unsigned int key, gchar const *value) {
             
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -109,7 +109,7 @@ void CFeOffset::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeOffset::onUpdate(SPCtx *ctx, guint flags) {
+void CFeOffset::update(SPCtx *ctx, guint flags) {
 	SPFeOffset* object = this->spfeoffset;
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
@@ -117,13 +117,13 @@ void CFeOffset::onUpdate(SPCtx *ctx, guint flags) {
         object->readAttr( "dy" );
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeOffset::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeOffset::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeOffset* object = this->spfeoffset;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -132,12 +132,12 @@ Inkscape::XML::Node* CFeOffset::onWrite(Inkscape::XML::Document *doc, Inkscape::
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeOffset::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeOffset::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeOffset* primitive = this->spfeoffset;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/offset.h b/src/filters/offset.h
index 684a3564f..df0f9768d 100644
--- a/src/filters/offset.h
+++ b/src/filters/offset.h
@@ -38,16 +38,16 @@ public:
 	CFeOffset(SPFeOffset* offset);
 	virtual ~CFeOffset();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeOffset* spfeoffset;
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index e6e18d7fe..718f9813c 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -65,8 +65,8 @@ sp_fepointlight_init(SPFePointLight *fepointlight)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFePointLight::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CObject::onBuild(document, repr);
+void CFePointLight::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CObject::build(document, repr);
 
 	SPFePointLight* object = this->spfepointlight;
 
@@ -82,7 +82,7 @@ void CFePointLight::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFePointLight::onRelease() {
+void CFePointLight::release() {
 	SPFePointLight* object = this->spfepointlight;
     //SPFePointLight *fepointlight = SP_FEPOINTLIGHT(object);
 
@@ -97,7 +97,7 @@ void CFePointLight::onRelease() {
 /**
  * Sets a specific value in the SPFePointLight.
  */
-void CFePointLight::onSet(unsigned int key, gchar const *value) {
+void CFePointLight::set(unsigned int key, gchar const *value) {
 	SPFePointLight* object = this->spfepointlight;
 
     SPFePointLight *fepointlight = SP_FEPOINTLIGHT(object);
@@ -159,7 +159,7 @@ void CFePointLight::onSet(unsigned int key, gchar const *value) {
         break;
     default:
         // See if any parents need this value.
-    	CObject::onSet(key, value);
+    	CObject::set(key, value);
         break;
     }
 }
@@ -167,7 +167,7 @@ void CFePointLight::onSet(unsigned int key, gchar const *value) {
 /**
  *  * Receives update notifications.
  *   */
-void CFePointLight::onUpdate(SPCtx *ctx, guint flags) {
+void CFePointLight::update(SPCtx *ctx, guint flags) {
 	SPFePointLight* object = this->spfepointlight;
 
     SPFePointLight *fePointLight = SP_FEPOINTLIGHT(object);
@@ -180,13 +180,13 @@ void CFePointLight::onUpdate(SPCtx *ctx, guint flags) {
         object->readAttr( "z" );
     }
 
-    CObject::onUpdate(ctx, flags);
+    CObject::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFePointLight::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFePointLight::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFePointLight* object = this->spfepointlight;
     SPFePointLight *fepointlight = SP_FEPOINTLIGHT(object);
 
@@ -201,7 +201,7 @@ Inkscape::XML::Node* CFePointLight::onWrite(Inkscape::XML::Document *doc, Inksca
     if (fepointlight->z_set)
         sp_repr_set_css_double(repr, "z", fepointlight->z);
 
-    CObject::onWrite(doc, repr, flags);
+    CObject::write(doc, repr, flags);
 
     return repr;
 }
diff --git a/src/filters/pointlight.h b/src/filters/pointlight.h
index 766c7f5db..814a065be 100644
--- a/src/filters/pointlight.h
+++ b/src/filters/pointlight.h
@@ -47,14 +47,14 @@ public:
 	CFePointLight(SPFePointLight* pointlight);
 	virtual ~CFePointLight();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
 private:
 	SPFePointLight* spfepointlight;
diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp
index 8bb76e324..4f4b4e2e2 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -79,10 +79,10 @@ sp_feSpecularLighting_init(SPFeSpecularLighting *feSpecularLighting)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeSpecularLighting::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeSpecularLighting::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeSpecularLighting* object = this->spfespecularlighting;
 
-	CFilterPrimitive::onBuild(document, repr);
+	CFilterPrimitive::build(document, repr);
 
 	/*LOAD ATTRIBUTES FROM REPR HERE*/
 	object->readAttr( "surfaceScale" );
@@ -95,14 +95,14 @@ void CFeSpecularLighting::onBuild(SPDocument *document, Inkscape::XML::Node *rep
 /**
  * Drops any allocated memory.
  */
-void CFeSpecularLighting::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeSpecularLighting::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPFeSpecularLighting.
  */
-void CFeSpecularLighting::onSet(unsigned int key, gchar const *value) {
+void CFeSpecularLighting::set(unsigned int key, gchar const *value) {
 	SPFeSpecularLighting* object = this->spfespecularlighting;
 
     SPFeSpecularLighting *feSpecularLighting = SP_FESPECULARLIGHTING(object);
@@ -207,7 +207,7 @@ void CFeSpecularLighting::onSet(unsigned int key, gchar const *value) {
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -215,7 +215,7 @@ void CFeSpecularLighting::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeSpecularLighting::onUpdate(SPCtx *ctx, guint flags) {
+void CFeSpecularLighting::update(SPCtx *ctx, guint flags) {
 	SPFeSpecularLighting* object = this->spfespecularlighting;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG)) {
@@ -226,13 +226,13 @@ void CFeSpecularLighting::onUpdate(SPCtx *ctx, guint flags) {
         object->readAttr( "lighting-color" );
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeSpecularLighting::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeSpecularLighting::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeSpecularLighting* object = this->spfespecularlighting;
 
     SPFeSpecularLighting *fespecularlighting = SP_FESPECULARLIGHTING(object);
@@ -256,7 +256,7 @@ Inkscape::XML::Node* CFeSpecularLighting::onWrite(Inkscape::XML::Document *doc,
         sp_svg_write_color(c, sizeof(c), fespecularlighting->lighting_color);
         repr->setAttribute("lighting-color", c);
     }
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
@@ -264,12 +264,12 @@ Inkscape::XML::Node* CFeSpecularLighting::onWrite(Inkscape::XML::Document *doc,
 /**
  * Callback for child_added event.
  */
-void CFeSpecularLighting::onChildAdded(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
+void CFeSpecularLighting::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
 	SPFeSpecularLighting* object = this->spfespecularlighting;
 
     SPFeSpecularLighting *f = SP_FESPECULARLIGHTING(object);
 
-    CFilterPrimitive::onChildAdded(child, ref);
+    CFilterPrimitive::child_added(child, ref);
 
     sp_feSpecularLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -278,22 +278,22 @@ void CFeSpecularLighting::onChildAdded(Inkscape::XML::Node *child, Inkscape::XML
 /**
  * Callback for remove_child event.
  */
-void CFeSpecularLighting::onRemoveChild(Inkscape::XML::Node *child) {
+void CFeSpecularLighting::remove_child(Inkscape::XML::Node *child) {
 	SPFeSpecularLighting* object = this->spfespecularlighting;
 
     SPFeSpecularLighting *f = SP_FESPECULARLIGHTING(object);
 
-    CFilterPrimitive::onRemoveChild(child);
+    CFilterPrimitive::remove_child(child);
 
     sp_feSpecularLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
 }
 
-void CFeSpecularLighting::onOrderChanged(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) {
+void CFeSpecularLighting::order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) {
 	SPFeSpecularLighting* object = this->spfespecularlighting;
 
     SPFeSpecularLighting *f = SP_FESPECULARLIGHTING(object);
-    CFilterPrimitive::onOrderChanged(child, old_ref, new_ref);
+    CFilterPrimitive::order_changed(child, old_ref, new_ref);
 
     sp_feSpecularLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -318,7 +318,7 @@ static void sp_feSpecularLighting_children_modified(SPFeSpecularLighting *sp_spe
    }
 }
 
-void CFeSpecularLighting::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeSpecularLighting::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeSpecularLighting* primitive = this->spfespecularlighting;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/specularlighting.h b/src/filters/specularlighting.h
index 5a6eee99e..b7e8d8591 100644
--- a/src/filters/specularlighting.h
+++ b/src/filters/specularlighting.h
@@ -60,21 +60,21 @@ public:
 	CFeSpecularLighting(SPFeSpecularLighting* lighting);
 	virtual ~CFeSpecularLighting();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onChildAdded(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
-	virtual void onRemoveChild(Inkscape::XML::Node* child);
+	virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
+	virtual void remove_child(Inkscape::XML::Node* child);
 
-	virtual void onOrderChanged(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr);
+	virtual void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr);
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeSpecularLighting* spfespecularlighting;
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index e8834e79a..b56265c54 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -75,8 +75,8 @@ sp_fespotlight_init(SPFeSpotLight *fespotlight)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeSpotLight::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CObject::onBuild(document, repr);
+void CFeSpotLight::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CObject::build(document, repr);
 
 	SPFeSpotLight* object = this->spfespotlight;
 
@@ -97,7 +97,7 @@ void CFeSpotLight::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeSpotLight::onRelease() {
+void CFeSpotLight::release() {
 	SPFeSpotLight* object = this->spfespotlight;
     //SPFeSpotLight *fespotlight = SP_FESPOTLIGHT(object);
 
@@ -112,7 +112,7 @@ void CFeSpotLight::onRelease() {
 /**
  * Sets a specific value in the SPFeSpotLight.
  */
-void CFeSpotLight::onSet(unsigned int key, gchar const *value) {
+void CFeSpotLight::set(unsigned int key, gchar const *value) {
 	SPFeSpotLight* object = this->spfespotlight;
 
     SPFeSpotLight *fespotlight = SP_FESPOTLIGHT(object);
@@ -257,7 +257,7 @@ void CFeSpotLight::onSet(unsigned int key, gchar const *value) {
         break;
     default:
         // See if any parents need this value.
-    	CObject::onSet(key, value);
+    	CObject::set(key, value);
         break;
     }
 }
@@ -265,7 +265,7 @@ void CFeSpotLight::onSet(unsigned int key, gchar const *value) {
 /**
  *  * Receives update notifications.
  *   */
-void CFeSpotLight::onUpdate(SPCtx *ctx, guint flags) {
+void CFeSpotLight::update(SPCtx *ctx, guint flags) {
 	SPFeSpotLight* object = this->spfespotlight;
 
     SPFeSpotLight *feSpotLight = SP_FESPOTLIGHT(object);
@@ -283,13 +283,13 @@ void CFeSpotLight::onUpdate(SPCtx *ctx, guint flags) {
         object->readAttr( "limitingConeAngle" );
     }
 
-    CObject::onUpdate(ctx, flags);
+    CObject::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeSpotLight::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeSpotLight::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeSpotLight* object = this->spfespotlight;
     SPFeSpotLight *fespotlight = SP_FESPOTLIGHT(object);
 
@@ -314,7 +314,7 @@ Inkscape::XML::Node* CFeSpotLight::onWrite(Inkscape::XML::Document *doc, Inkscap
     if (fespotlight->limitingConeAngle_set)
         sp_repr_set_css_double(repr, "limitingConeAngle", fespotlight->limitingConeAngle);
 
-    CObject::onWrite(doc, repr, flags);
+    CObject::write(doc, repr, flags);
 
     return repr;
 }
diff --git a/src/filters/spotlight.h b/src/filters/spotlight.h
index bb1716fb2..51a1406de 100644
--- a/src/filters/spotlight.h
+++ b/src/filters/spotlight.h
@@ -61,14 +61,14 @@ public:
 	CFeSpotLight(SPFeSpotLight* spotlight);
 	virtual ~CFeSpotLight();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
 private:
 	SPFeSpotLight* spfespotlight;
diff --git a/src/filters/tile.cpp b/src/filters/tile.cpp
index b879038fa..436f9cd0b 100644
--- a/src/filters/tile.cpp
+++ b/src/filters/tile.cpp
@@ -52,21 +52,21 @@ sp_feTile_init(SPFeTile *feTile)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeTile::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
-	CFilterPrimitive::onBuild(document, repr);
+void CFeTile::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	CFilterPrimitive::build(document, repr);
 }
 
 /**
  * Drops any allocated memory.
  */
-void CFeTile::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeTile::release() {
+	CFilterPrimitive::release();
 }
 
 /**
  * Sets a specific value in the SPFeTile.
  */
-void CFeTile::onSet(unsigned int key, gchar const *value) {
+void CFeTile::set(unsigned int key, gchar const *value) {
 	SPFeTile* object = this->spfetile;
 
     SPFeTile *feTile = SP_FETILE(object);
@@ -75,7 +75,7 @@ void CFeTile::onSet(unsigned int key, gchar const *value) {
     switch(key) {
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -83,7 +83,7 @@ void CFeTile::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeTile::onUpdate(SPCtx *ctx, guint flags) {
+void CFeTile::update(SPCtx *ctx, guint flags) {
 	SPFeTile* object = this->spfetile;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -93,13 +93,13 @@ void CFeTile::onUpdate(SPCtx *ctx, guint flags) {
 
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeTile::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeTile::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeTile* object = this->spfetile;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -108,12 +108,12 @@ Inkscape::XML::Node* CFeTile::onWrite(Inkscape::XML::Document *doc, Inkscape::XM
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     return repr;
 }
 
-void CFeTile::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeTile::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeTile* primitive = this->spfetile;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/tile.h b/src/filters/tile.h
index 01cddc726..3ef56b515 100644
--- a/src/filters/tile.h
+++ b/src/filters/tile.h
@@ -37,16 +37,16 @@ public:
 	CFeTile(SPFeTile* tile);
 	virtual ~CFeTile();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeTile* spfetile;
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index 6b704d825..759fb6c23 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -60,10 +60,10 @@ sp_feTurbulence_init(SPFeTurbulence *feTurbulence)
  * our name must be associated with a repr via "sp_object_type_register".  Best done through
  * sp-object-repr.cpp's repr_name_entries array.
  */
-void CFeTurbulence::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+void CFeTurbulence::build(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPFeTurbulence* object = this->spfeturbulence;
 
-	CFilterPrimitive::onBuild(document, repr);
+	CFilterPrimitive::build(document, repr);
 
 	/*LOAD ATTRIBUTES FROM REPR HERE*/
 	object->readAttr( "baseFrequency" );
@@ -76,8 +76,8 @@ void CFeTurbulence::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 /**
  * Drops any allocated memory.
  */
-void CFeTurbulence::onRelease() {
-	CFilterPrimitive::onRelease();
+void CFeTurbulence::release() {
+	CFilterPrimitive::release();
 }
 
 static bool sp_feTurbulence_read_stitchTiles(gchar const *value){
@@ -109,7 +109,7 @@ static Inkscape::Filters::FilterTurbulenceType sp_feTurbulence_read_type(gchar c
 /**
  * Sets a specific value in the SPFeTurbulence.
  */
-void CFeTurbulence::onSet(unsigned int key, gchar const *value) {
+void CFeTurbulence::set(unsigned int key, gchar const *value) {
 	SPFeTurbulence* object = this->spfeturbulence;
 
     SPFeTurbulence *feTurbulence = SP_FETURBULENCE(object);
@@ -164,7 +164,7 @@ void CFeTurbulence::onSet(unsigned int key, gchar const *value) {
             }
             break;
         default:
-        	CFilterPrimitive::onSet(key, value);
+        	CFilterPrimitive::set(key, value);
             break;
     }
 }
@@ -172,7 +172,7 @@ void CFeTurbulence::onSet(unsigned int key, gchar const *value) {
 /**
  * Receives update notifications.
  */
-void CFeTurbulence::onUpdate(SPCtx *ctx, guint flags) {
+void CFeTurbulence::update(SPCtx *ctx, guint flags) {
 	SPFeTurbulence* object = this->spfeturbulence;
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
@@ -182,13 +182,13 @@ void CFeTurbulence::onUpdate(SPCtx *ctx, guint flags) {
 
     }
 
-    CFilterPrimitive::onUpdate(ctx, flags);
+    CFilterPrimitive::update(ctx, flags);
 }
 
 /**
  * Writes its settings to an incoming repr object, if any.
  */
-Inkscape::XML::Node* CFeTurbulence::onWrite(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
+Inkscape::XML::Node* CFeTurbulence::write(Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) {
 	SPFeTurbulence* object = this->spfeturbulence;
 
     /* TODO: Don't just clone, but create a new repr node and write all
@@ -197,7 +197,7 @@ Inkscape::XML::Node* CFeTurbulence::onWrite(Inkscape::XML::Document *doc, Inksca
         repr = object->getRepr()->duplicate(doc);
     }
 
-    CFilterPrimitive::onWrite(doc, repr, flags);
+    CFilterPrimitive::write(doc, repr, flags);
 
     /* turbulence doesn't take input */
     repr->setAttribute("in", 0);
@@ -205,7 +205,7 @@ Inkscape::XML::Node* CFeTurbulence::onWrite(Inkscape::XML::Document *doc, Inksca
     return repr;
 }
 
-void CFeTurbulence::onBuildRenderer(Inkscape::Filters::Filter* filter) {
+void CFeTurbulence::build_renderer(Inkscape::Filters::Filter* filter) {
 	SPFeTurbulence* primitive = this->spfeturbulence;
 
     g_assert(primitive != NULL);
diff --git a/src/filters/turbulence.h b/src/filters/turbulence.h
index 490f49156..ccfa3da92 100644
--- a/src/filters/turbulence.h
+++ b/src/filters/turbulence.h
@@ -50,16 +50,16 @@ public:
 	CFeTurbulence(SPFeTurbulence* turb);
 	virtual ~CFeTurbulence();
 
-	virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void onRelease();
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
 
-	virtual void onSet(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const gchar* value);
 
-	virtual void onUpdate(SPCtx* ctx, unsigned int flags);
+	virtual void update(SPCtx* ctx, unsigned int flags);
 
-	virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
-	virtual void onBuildRenderer(Inkscape::Filters::Filter* filter);
+	virtual void build_renderer(Inkscape::Filters::Filter* filter);
 
 private:
 	SPFeTurbulence* spfeturbulence;