Following the comments on #8659, this PR fix some formatting and naming issues.
Attach a file by drag & drop or click to upload