Updated id names to make them less confusing