Better categorization of execises

I would like to see the strength trainer exercises being grouped by main movement instead of random prefixes.

I.e. all lunges should be named:

Lunge - alternating, body weight

Lunge - alternating, barbell

Lunge - L, barbell

Lunge - R, barbell

Secondly, I would love if the repetoire was populated with all the common crossfit movements. I am missing a lot of the One armed over head lunges, strict pull up, kipping handstand push up, cross-overs skip rope and many others.