cleanups
make sure trailing package components can start with numbers