Macro for pattern variant's fact now can be used without name prefix.
Macro for identifying correct inventories now accept pattern variant
without prefix.

Signed-off-by: selmeci <selmeci.roman@gmail.com>