Changed some names, fixed one typo