Updated L3 for configurable name strategy