No, goths are still goths. Emo kids are the ones who spend a lot of time on their fringes, often have facial/extravagant ear piercings, listen to Death Cab For Cutie-type music, and have a reputation for being somewhat morose/suffering existential guilt/navel-gazey.
HERE IS AN IMPORTANT FACT:
Like many other terms, Emo has become a catch-it-all term that has been perverted and misused and now the misuse is all-pervasive and has replaced the original term. The birth of Emo came about in the mid-80s with bands such as Rites of Spring and Mission of Burma who put a more melodic edge upon the hardcore music of the day, and often sounded quite angsty. Emo gradually became applied to any mopey music and any of the people who listen to it; which really couldn't be further from the truth. Really, it doesn't mean anything now. I know all this because I am a musical historian and know pretty much everything about everything musical.