Fix the badly renamed directories