Changed names for constants and options.