Fix deprecated forms of asset and usage keys