Updated package names to follow standards