Fix name/version regexp in model keys