Refactor pakage name