Support model names that end in `id`

[janvt]

When generating a model with a name that ends in id and asking it to generate an identity, the identity class is not suffixed with an additional Id, leaving both classes called the same. I suppose the same would happen with uuid.

[janvt]

One could argue that the model name should not end in id. However a model could be called HorseCupid or Paraboloid and the issue would also persist.