Replaced current static resource keys with new dynamic resource keys & update usages