Fixing keyword migration