Merge "Add EXCLUDED_CRATES and better default names"