Renamed members to be more unique