Minor fixes to stop names