Use generic msisdn_prefix everywhere