fixed S package names, cosmetics