tzhang - rename packageName the second time..