adjust not found errors
support bundles defining into their own name