Original commit message from CVS: various name fixes and sundry
Attach a file by drag & drop or click to upload
