Fixed Errors. Renaming stuff