Modified some names. Added a few others