Renaming to match original iOS names
Source Formatting
Further renaming