Merge "Rename remaining layouts to original search names"