Renames, stability changes

Rename traits that are too long, make changes to stability levels