Internal renaming to generalised names