Fix up file rename in csproj

Also additional cleanup for iOS