Update apply-setters, create-setters and ensure-name-substring

Update apply-setters, create-setters and ensure-name-substring #5995