rewrote names to match recommended style