change methods and fields name more readable