Added additional naming options.