fixup name a bit