Refactore packages names