genral fixes (names, variables, etc) on Controller, DAO, Model & WS