Renamed package path-basename for nicer includes.