Fixed typos
Implemented package name matching