Trim folder name before creating/renaming, #511837