Fix resource names and package dependencies