Change naming to be consistent, adds docs
Fixes style