Rename legacy types