Follow naming convention, exception type fix
documentation grammar fix