renamed two methods names
updated usages