We really need some richer vocabulary for this. Ingroups in the senses of "groups you have positive feelings towards", "groups you consciously consider yourself part of", and "groups you subconsciously affiliate with, e.g. those for which, if their values are attacked, you feel offended" all seem to be psychologically distinct (if correlated), but often get conflated with each other, producing a lot of unproductive semantic argument.