Rename mixin to be focus on a single task