Reorganizing some of the position titles