camelCase and removed name checking