Various Icon and Name fixes