fixed name issue with remove
fixed name
fix filepath