Added configurable naming strategy