Replace deprecated identifiers

Xcode 6 was unhappy before this change.