Names changes

Easier for URL manipulation