Changed naming to fix better to python style