WIP iOS support, some more consistent file naming