changing package name for consistency