Updated package naming convention