Major model naming bug corrected.

All models renamed.