Improved order items attributes names

This closes the #5551