Update to add helpers, rename prefix() to name_prefix()