Autopilot is part of FSD really. Full Self-Driving is the overarching software suite including the ability to flip between highway and city streets functionality, but driving on highways is part of being fully self-driving
Autosteer on City Streets is what we need to separate from Autopilot, both are modules within FSD