Merge "Replace confusing member name"