Update formatting of included variable names