Refactoring : Change the Class and function names associated with the DB in a more intuitive