Begin documentation, repair broken naming