Similar to product comments, this stuff should probably wind up renamed eventually as well.