refactor packagenames