Merge 15722:15806 from head and adjust new views to rails 2 style names.