 Having just 'entity' as property name could be misleading, '{entity}Id' would be much clearer Example:  Need to rename and implement logic that will allow to have both options if needed