change ID names

adhere to naming conventions