changed names to appropriately match the assigned issue