Updated names
Fixed path name