Update ShadowSweeper for new naming conventions
Merge pull request #1603 from Cottser/shadowsweeper

Update ShadowSweeper for new naming conventions