* rename stuff according to convention