refactoring of class and method names for @joshsh.