Updated name strategy to be configurable