Update for the rename of methods from xxx_str to xxx_string