Wierd renaming
Properly modified package names