Fixes for a new naming convention used in iOS7