Beginnings of switch to uniform naming scheme