name/ID fix