Renamed members to appropriately reflect what they're representing