Refactoring connection
Refactoring connection
Change names