Merge "Rename viewport and frame"