Rename misleading class