Update iStumbler for new naming conventions
Merge pull request #1639 from Cottser/istumbler

Update iStumbler for new naming conventions