Improved docs, added better naming convention
Renamed