more renaming package stuff