Renaming some methods + started on type checker