Revert "mDistF -> mDist"

This reverts commit 93c84fc2669f4ed89c638d268dce00626c40bdf3.
Revert "Revert "mDistF -> mDist""

This reverts commit 9170953f3c0fa878261af7cb2eeb683546a8fb46.