Corrected angle names/order