inclusion of these names was unintentional and in most cases is a
namespace violation. Daniel Sabogal tracked down and reported these.