Update folder names in sync with core changes.