change name according to Seldaek recommendation