Change layout names to distinguish from core layouts

Merge request reports

Loading