updated function prefixes, etc