Do some renaming of stuffs
Clean up