Clarify the naming and fix a bug with move need check (OMS-345)