diff --git a/lib/Travel/Status/DE/HAFAS/Journey.pm b/lib/Travel/Status/DE/HAFAS/Journey.pm
index 69f8434a4172d19bd1125b4addd2f369a035bc14..2d13288a1a46aba5863d78a6a55fa926d7ef36a2 100644
--- a/lib/Travel/Status/DE/HAFAS/Journey.pm
+++ b/lib/Travel/Status/DE/HAFAS/Journey.pm
@@ -15,7 +15,7 @@ our $VERSION = '4.05';
 Travel::Status::DE::HAFAS::Journey->mk_ro_accessors(
 	qw(datetime sched_datetime rt_datetime
 	  is_cancelled is_partially_cancelled
-	  station station_uic platform sched_platform rt_platform operator
+	  station station_eva platform sched_platform rt_platform operator
 	  id name type type_long class number line line_no load delay
 	  route_end route_start origin destination direction)
 );
@@ -200,7 +200,7 @@ sub new {
 
 	if ( $journey->{stbStop} ) {
 		$ref->{station}     = $locL[ $journey->{stbStop}{locX} ]->{name};
-		$ref->{station_uic} = 0 + $locL[ $journey->{stbStop}{locX} ]->{extId};
+		$ref->{station_eva} = 0 + $locL[ $journey->{stbStop}{locX} ]->{extId};
 		$ref->{sched_platform} = $journey->{stbStop}{dPlatfS};
 		$ref->{rt_platform}    = $journey->{stbStop}{dPlatfR};
 		$ref->{platform}       = $ref->{rt_platform} // $ref->{sched_platform};
@@ -254,6 +254,12 @@ sub new {
 
 # {{{ Accessors
 
+# Legacy
+sub station_uic {
+	my ($self) = @_;
+	return $self->{station_eva};
+}
+
 sub is_changed_platform {
 	my ($self) = @_;
 
@@ -546,10 +552,9 @@ if the backend does not provide an operator.
 
 Name of the station at which this journey was requested.
 
-=item $journey->station_uic (station only)
+=item $journey->station_eva (station only)
 
 UIC/EVA ID of the station at which this journey was requested.
-May be renamed in future releases.
 
 =item $journey->route
 
diff --git a/lib/Travel/Status/DE/HAFAS/StopFinder.pm b/lib/Travel/Status/DE/HAFAS/StopFinder.pm
index 6c02373c3637b24da5bcdadead6293a9ba5c1423..1cc22f3dac1e837758e6445bd83f06490f559e77 100644
--- a/lib/Travel/Status/DE/HAFAS/StopFinder.pm
+++ b/lib/Travel/Status/DE/HAFAS/StopFinder.pm
@@ -260,8 +260,8 @@ no error occurred, returns undef.
 =item $stopfinder->results
 
 Returns a list of stop candidates. Each list element is a hash reference. The
-hash keys are B<id> (IBNR / UIC station code) and B<name> (stop name). Both can
-be used as input for the Travel::Status::DE::HAFAS(3pm) constructor.
+hash keys are B<id> (IBNR / EVA / UIC station code) and B<name> (stop name).
+Both can be used as input for the Travel::Status::DE::HAFAS(3pm) constructor.
 
 If no matching results were found or the parser / HTTP request failed, returns
 the empty list.