Being more explicit in model naming. Fixing markdown parsing