renaming

Removed some useless stuff and fixed some names