more consistent package naming