method name change fix
Merge branch 'simplify-fix' into dev