Change to rust pkg naming conventions