Change how snippets are called

Hello,
I'd like to add these modifications to the files if it's ok with you.
Maybe this way are easier to use with out "@" symbol.