changed more text
Merge remote-tracking branch 'origin/more-text-changes' into name-changes