Update naming convention iOS OSX