fixed most of the business meanings

Fixed most of the method names due to database refactoring