Update SelfControl for new naming conventions
Merge pull request #1602 from Cottser/selfcontrol

Update SelfControl for new naming conventions