User readable versions to be packaged with
General cleanup/name changes
General spacing cleanup