[PATCH v7 7/7] variable rename