Update Xcode 6.1 compatible.
Update convention.