consistent naming; fix default value