fix old naming scheme