made a few changes to the names