[POLISH] couple of class/method rename