Import sort and client naming from rsharman-patch, fix names