Updated legacy variable substitution
Changed files descriptions