Update LaunchControl for new naming conventions
Merge pull request #1580 from Cottser/launchcontrol

Update LaunchControl for new naming conventions