[6.15.z] Use type(self) instead of entity class name in create methods

[6.15.z] Use type(self) instead of entity class name in create methods #1261