[OE-3259] this is better, keep the model names