Remove KIE references
Fix wrong package names