Text fixes and rename.