Follow-up to r15791: Rename "user" and "text" when upgrading on PostgreSQL