rename + add charset