Redesigned and renamed challenge and proof generators