The result of the discussion was rename (keep redirects), inline with the previous discussion linked below
In the previous discussion the following templates and categories were missed:
propose rename to match. Agathoclea (talk) 06:54, 1 October 2011 (UTC)[reply]