Fixed processing of variable names and CodeBook.