Normalize usage of entity in button directives