Put product names in line with resource names for tighter integration
Merge pull request #46 from swizzlr/fix-targets

Put product names in line with resource names for tighter integration
Merge remote-tracking branch 'upstream/master'