After checking, various sources, I find you are right= several sites still think the pleated overdress is the colobium Sindonis, but as you say it is the white square shaped dress put on first, then the mantle and girdle over it.