Clean Up

Just cleaned up the names of several things