fix similar method and variale names