Consistently using package name to differentiate V3 and V4