diff --git a/lib/methods.js b/lib/methods.js
index 00f83ce..450e63f 100644
--- a/lib/methods.js
+++ b/lib/methods.js
@@ -61,7 +61,7 @@ inflect.camelize = function (lower_case_and_underscored_word, first_letter_in_up
 inflect.underscore = function (camel_cased_word) {
   var self;
   self = util.string.gsub(camel_cased_word, /\./, '/');
-  self = util.string.gsub(self, /([A-Z]+)([A-Z][a-z])/, '$1_$2');
+  self = util.string.gsub(self, /([A-Z])([A-Z][a-z])/, '$1_$2');
   self = util.string.gsub(self, /([a-z\d])([A-Z])/, '$1_$2');
   self = util.string.gsub(self, /-/, '_');
   return self.toLowerCase();
@@ -230,5 +230,5 @@ inflect.tableize = function (class_name) {
 //
 //     "business".classify()       // => "Busines"
 inflect.classify = function (table_name) {
-  return inflect.camelize(inflect.singularize(util.string.gsub(table_name, /.*\./, '')));
+  return inflect.camelize(inflect.singularize(util.string.gsub(table_name, /^.*\./, '')));
 };