Minor naming changes
Merge branch 'master' of https://github.com/KITrokopter/Quadcopter-Application