Refactor :
* Rename
* Using interface

Warning : indexing is disabled now for new content