replaced some name and other fixes
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM into fix-name
Merge pull request #1756 from KoffeinFlummi/fix-name

More name fixes, wasn't supposed to be a PR