Adjust to rustpkg convention