Fixed package names and accidently renamed resource names.