Update code style settings
Fix naming