Minor corrections, renaming to CSShim