rename; fix encoding of #20