Hello:

You may want to apply the attached patch which
removes double/obsolete entries, makes some minor
name clarifications.

Regards;
Özkan Sezer