Modified getCurrentPairName method