Update folder naming conventions