Renaming and some more refactoring..