Lint connection resource
Rename and refactor error messages-related code