Update IceFloor for new naming conventions
Merge pull request #1577 from Cottser/icefloor

Update IceFloor for new naming conventions