Make connection name handling more sane