changing some id's and names
10 files changed