Changed KPath to NamePath.
Merge remote-tracking branch 'upstream/master'
Correcting back to namePath after failed merge.