Grouped variable expressions under the same interface and updated affected files