Fixed some Swift renaming issues from Xcode beta 5.