Fixed model naming inconsistency
Further model name fixes