Fix package names, document matcher priority