Fix POD syntax and use camelCase syntax