change package names to conventional ones