Fix #13 - Rename 'name' option to 'server_name'