Final name fix