Updated legacy names.