Corrected package naming and attributions