Merge "Get struct names only for non-literal structs"