Change variable style and fix Objective-C