Some internal signal renaming