Change package naming convention