Fixed naming issues of patch folder