Fix some old names that remained - most in doxygen doc that was never renamed - some re-introduced in comments/doc/strings by me