Merge "Fix broken input property names."