[jhc] darcs patch: use quoteName mechanism to pre-rename ce... (and 1 more)