iOS - Renaming some things
Work on asynchronicity