Refactor with method name changes