If you use “ascribed gender” and “gender identity” to describe the (external and internal, respectively) social traits, you avoid the confusion between the two and with the biological trait that comes with using bare “gender” for that purpose.