Close, but in operant conditioning, reinforcement encourages good behavior, and punishment discourages bad. So it's:
Positive reinforcement: add good thing in response to desirable behavior Negative reinforcement: remove bad thing in response to desirable behavior
Positive punishment: add bad thing in response to undesirable behavior Negative punishment: remove good thing in response to undesirable behavior