Hari Om!
Any adhyaropa, superimposition followed by prayatna, effort that leads you what it really is will be called samvadi brahma.
To meet the definition of upasana, such a superimposition has to be sanctioned by shastra. The instances you have cited will meet that criterion.
I just want to remind you what Swamiji had emphasized, the upasana is a bhrama, but the paroksha knowledge is just fine.
