Unify naming
Test Solution