Update member/method name to avoid collision and fix CS