Fix naming convention and default options