Rename connection functions to make more sense