<p>So, for clarity, this is the exact sequence of events:
</p>
- At the end of chapter 588, Madara uses the cloaked Susanoo form and does in fact say "this (is) Complete Body Susanoo" (この完成体須佐能乎でな) in the final panel.
- At the start of chapter 589, Mei asks if this is the "true Susanoo" (本当の須佐能乎). Madara replies "not yet" and tells somebody/something (presumably Susanoo itself) to "settle" (定まる). Susanoo then enters its final, armoured form.
- Ōnoki then says that the giant's chakra has "stabilised" (安定した); Madara himself isn't actually the one who says this, and it's never mentioned again after this.
- The term "Complete Body Susanoo" only appears one more time in the manga, in chapter 592, when Madara claims that everyone who sees it dies.
<p>Based on this alone, it does seem like Madara considers both forms to be "Complete Body Susanoo", but the problem is what comes after. Sasuke obtains the final armoured form without displaying any evidence of an unstabilised version like Madara's, plus we never see Madara use anything else that could be equivalent to Itachi and Sasuke's third (armoured) forms. Lastly, the databook has an entry for Complete Body Susanoo that only shows and talks about Madara's final armoured stage, specifically noting the wings as special features of the form.
</p><p>That's really all the evidence we have to go on. Everything else comes down to interpretation.
</p>