naming scheme cleanup