What branch of study was psychology before it was called psychology?

Some parts of psychology were philosophy, while others were in medicine. Freud, for example, was a medical doctor.