changed a couple names