Member name re-factoring