Replace some hardcoded package names with PACKAGE macro