V2/camel case

camelCase names re: #23 and #25