Updated the way names are constructed.

Also added methods to find stations & lines by type.