More updates about new conventions.
Rename package.