Simplify
Big renaming

Close #277 #308
Simplify