In fact the whitepaper even opens with describing Bitcoin's usage for commerce. The very first paragraph in the introduction!
The narrative has indeed changed to "digital gold" after it's made abundantly clear that Bitcoin is no longer suitable for commerce.