switch to havana and quantum renaming [7/8]