Sanitized `_resolve_name`, added `%include` support.