Changed method names to more suitable names