Added missing packages
Be more generous with name length