Further aligned the contracts: name and method are named exactly alike now