Merge pull request #13895 from vjpai/missing_prefix

Fix prefix in struct names