diff --git a/lib/public_activity/creation.rb b/lib/public_activity/creation.rb
index <HASH>..<HASH> 100644
--- a/lib/public_activity/creation.rb
+++ b/lib/public_activity/creation.rb
@@ -12,13 +12,13 @@ module PublicActivity
         # Creates activity upon creation of the tracked model
         def activity_on_create
           settings = prepare_settings
-          create_activity("activity."+self.class.name.downcase+".create", settings[:owner], settings[:parameters])
+          create_activity("activity."+self.class.name.parameterize('_')+".create", settings[:owner], settings[:parameters])
         end
         
         # Creates activity upon modification of the tracked model
         def activity_on_update
           settings = prepare_settings
-          create_activity("activity."+self.class.name.downcase+".update", settings[:owner], settings[:parameters])
+          create_activity("activity."+self.class.name.parameterize('_')+".update", settings[:owner], settings[:parameters])
         end
     end
   end
diff --git a/lib/public_activity/destruction.rb b/lib/public_activity/destruction.rb
index <HASH>..<HASH> 100644
--- a/lib/public_activity/destruction.rb
+++ b/lib/public_activity/destruction.rb
@@ -11,7 +11,7 @@ module PublicActivity
         # Records an activity upon destruction of the tracked model
         def activity_on_destroy
           settings = prepare_settings
-          create_activity("activity."+self.class.name.downcase+".destroy", settings[:owner], settings[:parameters])
+          create_activity("activity."+self.class.name.parameterize('_')+".destroy", settings[:owner], settings[:parameters])
         end
     end
   end
Paremeterize class names in keys instead of downcasing