Fixing names and settings
ok