Style fixes

Single quotes, plus fixed an apparent bug where "name" was passed as a
quoted string instead of a variable.
Merge pull request #14160 from terminalmage/style-fixes

Style fixes