Changed a few names and general clean up