expand variable names to conform to standard