No. Keyboard is a generic term for any key-based instrument (piano, synthesizer, electronic keyboard). Organ specifically refers to wind instruments that produce sound by driving pressurized air through pipes (pipe organ) or electronic equivalents (electronic organ, reed organ).