Added resource name generation