Tweak class naming and add KSS references