consolidate; change name