mroe fixes to name