Update GrabBox for new naming conventions
Merge pull request #1565 from Cottser/grabbox

Update GrabBox for new naming conventions