rename droplets and fix bug