Fixed some names and stuff