FN_LOCAL_STRING(volume, volume)
FN_LOCAL_STRING(veto_files, veto_files)
FN_LOCAL_STRING(hide_files, hide_files)
-FN_LOCAL_STRING(veto_oplocks, veto_oplocks)
+FN_LOCAL_STRING(veto_oplock_files, veto_oplock_files)
FN_LOCAL_STRING(aio_write_behind, aio_write_behind)
FN_LOCAL_STRING(dfree_command, dfree_command)
FN_LOCAL_BOOL(autoloaded, autoloaded)
FN_LOCAL_BOOL(preexec_close, preexec_close)
FN_LOCAL_BOOL(rootpreexec_close, rootpreexec_close)
FN_LOCAL_INTEGER(case_sensitive, case_sensitive)
-FN_LOCAL_BOOL(preservecase, preservecase)
-FN_LOCAL_BOOL(shortpreservecase, shortpreservecase)
+FN_LOCAL_BOOL(preserve_case, preserve_case)
+FN_LOCAL_BOOL(short_preserve_case, short_preserve_case)
FN_LOCAL_BOOL(hide_dot_files, hide_dot_files)
FN_LOCAL_BOOL(hide_special_files, hide_special_files)
-FN_LOCAL_BOOL(hideunreadable, hideunreadable)
-FN_LOCAL_BOOL(hideunwriteable_files, hideunwriteable_files)
+FN_LOCAL_BOOL(hide_unreadable, hide_unreadable)
+FN_LOCAL_BOOL(hide_unwriteable_files, hide_unwriteable_files)
FN_LOCAL_BOOL(access_based_share_enum, access_based_share_enum)
FN_LOCAL_BOOL(guest_ok, guest_ok)
FN_LOCAL_BOOL(guest_only, guest_only)
FN_LOCAL_BOOL(strict_allocate, strict_allocate)
FN_LOCAL_BOOL(delete_readonly, delete_readonly)
FN_LOCAL_BOOL(fake_oplocks, fake_oplocks)
-FN_LOCAL_BOOL(recursive_veto_delete, recursive_veto_delete)
+FN_LOCAL_BOOL(delete_veto_files, delete_veto_files)
FN_LOCAL_BOOL(dos_filemode, dos_filemode)
FN_LOCAL_BOOL(dos_filetimes, dos_filetimes)
FN_LOCAL_BOOL(dos_filetime_resolution, dos_filetime_resolution)
-FN_LOCAL_BOOL(fake_dir_create_times, fake_dir_create_times)
+FN_LOCAL_BOOL(fake_directory_create_times, fake_directory_create_times)
FN_LOCAL_BOOL(blocking_locks, blocking_locks)
FN_LOCAL_BOOL(inherit_perms, inherit_perms)
FN_LOCAL_BOOL(inherit_acls, inherit_acls)
FN_LOCAL_PARM_BOOL(kernel_change_notify, kernel_change_notify)
FN_LOCAL_BOOL(durable_handles, durable_handles)
-FN_GLOBAL_BOOL(allow_insecure_widelinks, allow_insecure_widelinks)
+FN_GLOBAL_BOOL(allow_insecure_wide_links, allow_insecure_wide_links)
FN_GLOBAL_BOOL(allow_nt4_crypto, allow_nt4_crypto)
FN_GLOBAL_BOOL(allow_trusted_domains, allow_trusted_domains)
FN_GLOBAL_BOOL(async_smb_echo_handler, async_smb_echo_handler)
FN_GLOBAL_CONST_STRING(template_homedir, template_homedir)
FN_GLOBAL_CONST_STRING(template_shell, template_shell)
FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
-FN_GLOBAL_CONST_STRING(utmpdir, utmpdir)
+FN_GLOBAL_CONST_STRING(utmp_directory, utmp_directory)
FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, winbindd_privileged_socket_directory)
FN_GLOBAL_CONST_STRING(winbindd_socket_directory, winbindd_socket_directory)
FN_GLOBAL_CONST_STRING(winbind_separator, winbind_separator)
FN_GLOBAL_CONST_STRING(workgroup, workgroup)
-FN_GLOBAL_CONST_STRING(wtmpdir, wtmpdir)
+FN_GLOBAL_CONST_STRING(wtmp_directory, wtmp_directory)
FN_GLOBAL_INTEGER(afs_token_lifetime, afs_token_lifetime)
FN_GLOBAL_INTEGER(algorithmic_rid_base, algorithmic_rid_base)
FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates)
FN_GLOBAL_LIST(winbind_nss_info, winbind_nss_info)
FN_GLOBAL_LIST(wins_server_list, wins_server_list)
FN_GLOBAL_STRING(abort_shutdown_script, abort_shutdown_script)
-FN_GLOBAL_STRING(addgroup_script, addgroup_script)
-FN_GLOBAL_STRING(addmachine_script, addmachine_script)
+FN_GLOBAL_STRING(add_group_script, add_group_script)
+FN_GLOBAL_STRING(add_machine_script, add_machine_script)
FN_GLOBAL_STRING(addport_cmd, addport_cmd)
FN_GLOBAL_STRING(addprinter_cmd, addprinter_cmd)
-FN_GLOBAL_STRING(add_share_cmd, add_share_cmd)
-FN_GLOBAL_STRING(adduser_script, adduser_script)
-FN_GLOBAL_STRING(addusertogroup_script, addusertogroup_script)
+FN_GLOBAL_STRING(add_share_command, add_share_command)
+FN_GLOBAL_STRING(add_user_script, add_user_script)
+FN_GLOBAL_STRING(add_user_to_group_script, add_user_to_group_script)
FN_GLOBAL_STRING(auto_services, auto_services)
-FN_GLOBAL_STRING(change_share_cmd, change_share_cmd)
+FN_GLOBAL_STRING(change_share_command, change_share_command)
FN_GLOBAL_STRING(check_password_script, check_password_script)
FN_GLOBAL_STRING(cups_server, cups_server)
FN_GLOBAL_STRING(defaultservice, defaultservice)
FN_GLOBAL_STRING(deleteprinter_cmd, deleteprinter_cmd)
-FN_GLOBAL_STRING(delete_share_cmd, delete_share_cmd)
-FN_GLOBAL_STRING(delgroup_script, delgroup_script)
-FN_GLOBAL_STRING(deluserfromgroup_script, deluserfromgroup_script)
-FN_GLOBAL_STRING(deluser_script, deluser_script)
+FN_GLOBAL_STRING(delete_share_command, delete_share_command)
+FN_GLOBAL_STRING(delete_group_script, delete_group_script)
+FN_GLOBAL_STRING(delete_user_from_group_script, delete_user_from_group_script)
+FN_GLOBAL_STRING(delete_user_script, delete_user_script)
FN_GLOBAL_STRING(enumports_cmd, enumports_cmd)
FN_GLOBAL_STRING(get_quota_command, get_quota_command)
FN_GLOBAL_STRING(iprint_server, iprint_server)
FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync)
FN_GLOBAL_STRING(renameuser_script, renameuser_script)
FN_GLOBAL_STRING(rootdir, rootdir)
-FN_GLOBAL_STRING(serverstring, serverstring)
-FN_GLOBAL_STRING(setprimarygroup_script, setprimarygroup_script)
+FN_GLOBAL_STRING(server_string, server_string)
+FN_GLOBAL_STRING(set_primary_group_script, set_primary_group_script)
FN_GLOBAL_STRING(set_quota_command, set_quota_command)
FN_GLOBAL_STRING(share_backend, share_backend)
FN_GLOBAL_STRING(shutdown_script, shutdown_script)