Rename "-2" suffixed classes

Close #17