Fix name-confusion

Got it mixed up.  Thanks for the catch, vache.
Merge pull request #7841 from KA101/fixturret

Fix name-confusion
Avoid possible -1 array out of bounds.
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod