Indeed these should be regrouped
edit: done

For the numbers code, why not, if there are none yet for some models and if they are official ones, we can use them