refactoring
renaming madness, all kinski- prefixes removed