How do I tag named railway station buildings?

In some areas, the name of a railway station is not the same as the name of the stop on the rail line; for instance, in Atlanta, Georgia, USA, the passenger rail station is known as "Peachtree Station", but of course as a stop on the Amtrak network it should be labelled as "Atlanta". I'm looking through the wiki pages on public_transport=* and railway=* and having a hard time understanding which parts are recommended, which are deprecated, and in general what I'm supposed to do here.

The best I've come up with so far is: an area outline for the station building itself, tagged with building=train_station, name=Peachtree Station, public_transport=station, and railway=station; and a node on the rail line with public_transport=stop_position, train=yes, and name=Atlanta. But should I be using ref=* for some of these? Is there a different set of tags I need?

(I should maybe add that the former tagging was a single node, next to the tracks, with railway=station and name=Atlanta.)