Some changes to package naming