Last commit with some clean-up and a name check.

I wish I could have participated more, unfortunately, time is not on my
side.