adjusted naming of some id's