Merge license changes and variable name display