Rename types of positions to position types, add model