Package names cleanup