updating to proper naming scheme