Update WhiteClock for new naming conventions
Merge pull request #1624 from Cottser/whiteclock

Update WhiteClock for new naming conventions