Fix after renaming packages