Aligned resource name for safer order matching
Merge pull request #17 from Phil-Friderici/resource_naming

Aligned resource name for safer order matching