Added week counter and option for name prefix