Moved strings to use KeySwap instead of KeyMaster
Move packages to use keyswap