update of naming scheme