Changed to include stop name, since that is nice for understanding
things like trip patterns and blocks.