Corrections and renaming!