* Map two new classes used in profiler * Rename methods * toProfilerString -> collect * Name changes for consistency