Clear code

Rename some entities