Fixes #3 - Adds support for content/name + name/content variations