Initial changes, rename to ksms, etc.