Fix name
Keep the bundle directory
Prefer the full name for keyword