ZVISION: More CamelCase and a bit of comments cleanup