Fixed move name issues