Fix package naming