fixed some last minute name changes