fix up id's

Original commit message from CVS:
fix up id's
25 files changed