Updated to use Claromentis standard UpperCamelCase