Do all the renaming
Compat with Jekyll 2