Updated and fixed name changes