Tweak layout names (to get gh-pages working)