Who is an astronaut? The inadequacy of current international law

The concept of ‘astronaut’ as found in law in the ‘space treaties’ and elsewhere does not fit well with the modern proposals for commercial space tourism. Will the ‘rescue and return’ provisions apply to commercial flights? Many national laws will apply to space tourism but for the future the international legal regime should be reconsidered. Finally what may happen in a crisis in space?