Changed name and scope of several members.