changing naming scheme