Small fixes
Renaming