use singular, more representative package names