Rename to doctor/dr, more migration work