Light refactoring - naming
Make sure connect setting is in place