Better naming and Xcode project