Update CLI with new template names

[clearab]

Update the CLI for naming changes.

Branch chrimc/naming has the changes for this--Ning you should merge this into your changes.

Changes:
`
enumSetenum -> enum-assign-enumEnity
Set -> -assign-
ChooseEntity -> Entity-choose

Let me know if any other changes are needed.