Renamed some model builder classes to modeller classes.