Updated factory API to latest version with hard-coded annotation based camel case names.