Feature/rename to flight