[PATCH v6 5/6] local variable rename