Added filename prefixing to triangles and points functions.