refactoring variables and classes names about Kind (in pckges model, controller and persistence)