className(): minor comment and guard macro name fixes