Change product name
Fix matrix bugs