Issue #3516285: Fixed collision between entities tokens and fields machine names by adding a validation handler on the machinename element.
Closes #3516285