added the 'ID' suffix to the names of attributes that hold IDs