Not modified if... not modified.
Added EXPERIMENTAL support for entity naming

This is still buggy.