do not use any Entity constant that is available in namespace, as it can be not a presenter one
Merge pull request #600 from fuksito/master

do not use any Entity constant that is available in namespace, as it can...