Fix/rename packaging