Updated hardcoded package names