rename package name for common-util