Changed connections to use underscores.