Fix package naming convention