-Some name changes and appropriate refactoring