Added proper reflection of package names