Fixed ambiguous naming