[PATCH 07/17] p2p: Consistently use the conn_ prefix for variables