updated nameing scheme