[Update] Ranaming; bug fixing