What is the difference between Organizational Psychology and General Psychology?

There seems to be a trend, where both industrial psychology and organizational psychology are used interchangeably nowadays. There is the field of industrial-organizational psychology as well, which encompasses both.

Industrial psychologists have been concerned with individual factors in selection, placement, job analysis and design, safety and training while Organizational psychologists, on the other hand, have examined the role of interpersonal relations, and individual differences especially in modifying and changing organizations, examining decision making, group dynamics, leadership, organizational development and change.

Industrial psychology is labeled as more empirical, experimental and precise as they test and select the best people o match the demands of job, and organizational psychology is mostly labeled as clinical, humanistic and they use more qualitative methods to obtain their data.