minor changes to naming of points and temporary files for non-aggregate development case