A number of pages were found that clashed when adjusting names. These were
found not to be overly troublesome to resolve (duplicate information or
empty pages). This commit resolves these files.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>