Files to be reviewed

The minorest, but 'sprefix' seems terribly non-pythonic, doesn't it?