Name of target kext should not be hardcoded

Also don't some cleanups.