Fixing naming inconsistancies
Work on API docs