fixed name changes
fixed path