Update and normalize naming scheme
Update docs