[DD-734] renamed some resources to ensure that the right ones are picked