Fixed resource-naming issues used by some calls