SQUASH ME: fixed module name
SQUASH ME: used proper function name after rebase