Fix support for any case model name