shipping method names less ugly
merged master in