rename variable names according to p&d eng version