Fix assets and naming