Some renames, better UX for timetable loading