Remove invalid property name
Update ContextAware attribute to use EntityTypePicker instead of requiring user to under qualified entity model name