Adapted naming scheme