minor name changing
Merge branch 'meilenstein3' of https://github.com/royfochtman/WBA2_Phase2 into meilenstein3