Fixed CamelCase issue(s)