wrap_view renamed to merge to better clarity.
layout renamed to layout_views for clarity.