Worked on renaming some class references and files