Name fixes, begun defense name fixes