Rename keyword to expression

:warning: Merge #1 before this one, please :warning: 

This renames the "keyword" field to "expression" to stay more flexible :)