properly rename old names